projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved (and renamed) global variables to game structure (ZX/ZY)
[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..946afd1aa0254dad4cb6d59d2937c5be9c0e4177 100644
(file)
--- a/
src/game_mm/mm_main.h
+++ b/
src/game_mm/mm_main.h
@@
-234,8
+234,6
@@
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 boolean SiebAktiv;
extern int SiebCount;
extern int TimeFrames, TimePlayed, TimeLeft;
extern boolean SiebAktiv;
extern int SiebCount;
@@
-333,10
+331,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
+699,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
+1177,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, \