projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed editor option to automatically count gems needed
[rocksndiamonds.git]
/
src
/
game_mm
/
mm_main.h
diff --git
a/src/game_mm/mm_main.h
b/src/game_mm/mm_main.h
index 38cb0e792b03d63baf72ecb55a69093dbfc3c924..9f8e04727ccb2bdaaab0e36f18f30c8497b05a3d 100644
(file)
--- a/
src/game_mm/mm_main.h
+++ b/
src/game_mm/mm_main.h
@@
-186,21
+186,10
@@
struct HiScore_MM
int Score;
};
int Score;
};
-extern Bitmap *pix[];
-extern DrawBuffer *fieldbuffer;
extern DrawBuffer *drawto_field;
extern DrawBuffer *drawto_field;
-extern int joystick_device;
-extern char *joystick_device_name[];
-
extern int game_status;
extern boolean level_editor_test_game;
extern int game_status;
extern boolean level_editor_test_game;
-extern boolean network_playing;
-
-extern int key_joystick_mapping;
-extern int global_joystick_status, joystick_status;
-extern int sound_status;
-extern boolean sound_loops_allowed;
extern boolean redraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern int redraw_x1, redraw_y1;
extern boolean redraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern int redraw_x1, redraw_y1;
@@
-219,7
+208,6
@@
extern short Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
extern unsigned int Elementeigenschaften[MAX_ELEMENTS];
extern short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
extern unsigned int Elementeigenschaften[MAX_ELEMENTS];
@@
-234,11
+222,7
@@
extern int FfwdFrameDelay;
extern int BX1, BY1, BX2, BY2;
extern int SBX_Left, SBX_Right;
extern int SBY_Upper, SBY_Lower;
extern int BX1, BY1, BX2, BY2;
extern int SBX_Left, SBX_Right;
extern int SBY_Upper, SBY_Lower;
-extern int ZX, ZY, ExitX, ExitY;
-extern int AllPlayersGone;
extern int TimeFrames, TimePlayed, TimeLeft;
extern int TimeFrames, TimePlayed, TimeLeft;
-extern boolean SiebAktiv;
-extern int SiebCount;
extern struct LevelInfo_MM native_mm_level;
extern struct HiScore_MM highscore[];
extern struct LevelInfo_MM native_mm_level;
extern struct HiScore_MM highscore[];
@@
-262,9
+246,6
@@
extern int color_status;
extern struct XY Step[];
extern short Sign[16];
extern struct XY Step[];
extern short Sign[16];
-extern char *sound_name[];
-extern int background_loop[];
-extern int num_bg_loops;
extern char *element_info[];
extern int num_element_info;
extern char *element_info[];
extern int num_element_info;
@@
-333,10
+314,10
@@
extern int num_element_info;
#define WALL_TOP (WALL_TOPLEFT | WALL_TOPRIGHT)
#define WALL_BOTTOM (WALL_BOTTOMLEFT | WALL_BOTTOMRIGHT)
#define WALL_TOP (WALL_TOPLEFT | WALL_TOPRIGHT)
#define WALL_BOTTOM (WALL_BOTTOMLEFT | WALL_BOTTOMRIGHT)
-/
*
game elements:
-
**
0 - 499: real elements, stored in level file
-
**
500 - 699: flag elements, only used at runtime
-*/
+/
/
game elements:
+
//
0 - 499: real elements, stored in level file
+
//
500 - 699: flag elements, only used at runtime
+
// "real" level elements
#define EL_MM_START 0
#define EL_MM_START_1 EL_MM_START
// "real" level elements
#define EL_MM_START 0
#define EL_MM_START_1 EL_MM_START
@@
-701,12
+682,11
@@
extern int num_element_info;
#define EL_MM_MASK_CIRCLE 709
#define EL_MM_MASK_CIRCLE 709
-/* game graphics:
-** 0 - 191: graphics from "MirrorScreen"
-** 192 - 255: pseudo graphics mapped to "MirrorScreen"
-** 256 - 511: graphics from "MirrorFont"
-** 512 - 767: graphics from "MirrorDF"
-*/
+// game graphics:
+// 0 - 191: graphics from "MirrorScreen"
+// 192 - 255: pseudo graphics mapped to "MirrorScreen"
+// 256 - 511: graphics from "MirrorFont"
+// 512 - 767: graphics from "MirrorDF"
#define IMG_EMPTY IMG_EMPTY_SPACE
#define IMG_EMPTY IMG_EMPTY_SPACE
@@
-1180,17
+1160,17
@@
extern int num_element_info;
#define MM_VERSION_MINOR(x) VERSION_PART_2(x)
#define MM_VERSION_PATCH(x) VERSION_PART_3(x)
#define MM_VERSION_MINOR(x) VERSION_PART_2(x)
#define MM_VERSION_PATCH(x) VERSION_PART_3(x)
-/
*
file version numbers for resource files (levels, score, setup, etc.)
-
**
currently supported/known file version numbers:
-
**
1.4 (still in use)
-
**
2.0 (actual)
-*/
+/
/
file version numbers for resource files (levels, score, setup, etc.)
+
//
currently supported/known file version numbers:
+
//
1.4 (still in use)
+
//
2.0 (actual)
+
#define MM_FILE_VERSION_1_4 MM_VERSION_IDENT(1,4,0)
#define MM_FILE_VERSION_2_0 MM_VERSION_IDENT(2,0,0)
#define MM_FILE_VERSION_1_4 MM_VERSION_IDENT(1,4,0)
#define MM_FILE_VERSION_2_0 MM_VERSION_IDENT(2,0,0)
-/
*
file version does not change for every program version, but is changed
-
when new features are introduced that are incompatible with older file
- versions, so that they can be treated accordingly */
+/
/
file version does not change for every program version, but is changed
+
//
when new features are introduced that are incompatible with older file
+// versions, so that they can be treated accordingly
#define MM_FILE_VERSION_ACTUAL MM_FILE_VERSION_2_0
#define MM_GAME_VERSION_ACTUAL MM_VERSION_IDENT(PROGRAM_VERSION_MAJOR, \
#define MM_FILE_VERSION_ACTUAL MM_FILE_VERSION_2_0
#define MM_GAME_VERSION_ACTUAL MM_VERSION_IDENT(PROGRAM_VERSION_MAJOR, \