projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added showing configured level on music info screen
[rocksndiamonds.git]
/
src
/
game_mm
/
export.h
diff --git
a/src/game_mm/export.h
b/src/game_mm/export.h
index b628a8d04c3b16ae3cee8b7479bd175abacaf173..11ee725812ad71272b5b37bfe2f738f08c22a2f0 100644
(file)
--- a/
src/game_mm/export.h
+++ b/
src/game_mm/export.h
@@
-34,7
+34,7
@@
#define EL_MM_START_1_NATIVE 0
#define EL_MM_START_1_NATIVE 0
-#define EL_MM_END_1_NATIVE 15
5
+#define EL_MM_END_1_NATIVE 15
9
#define EL_MM_CHAR_START_NATIVE 160
#define EL_MM_CHAR_END_NATIVE 239
#define EL_MM_CHAR_START_NATIVE 160
#define EL_MM_CHAR_END_NATIVE 239
@@
-42,6
+42,9
@@
#define EL_MM_START_2_NATIVE 240
#define EL_MM_END_2_NATIVE 430
#define EL_MM_START_2_NATIVE 240
#define EL_MM_END_2_NATIVE 430
+#define EL_MM_START_3_NATIVE 431
+#define EL_MM_END_3_NATIVE 446
+
#define EL_MM_RUNTIME_START_NATIVE 500
#define EL_MM_RUNTIME_END_NATIVE 504
#define EL_MM_RUNTIME_START_NATIVE 500
#define EL_MM_RUNTIME_END_NATIVE 504
@@
-143,9
+146,11
@@
struct GameInfo_MM
int ball_choice_pos; // current content element choice position
boolean laser_red, laser_green, laser_blue;
int ball_choice_pos; // current content element choice position
boolean laser_red, laser_green, laser_blue;
+ boolean has_mcduffin;
boolean level_solved;
boolean game_over;
int game_over_cause;
boolean level_solved;
boolean game_over;
int game_over_cause;
+ char *game_over_message;
boolean cheat_no_overload;
boolean cheat_no_explosion;
boolean cheat_no_overload;
boolean cheat_no_explosion;
@@
-179,6
+184,8
@@
struct LevelInfo_MM
int num_ball_contents;
int ball_choice_mode;
int ball_content[MM_MAX_BALL_CONTENTS];
int num_ball_contents;
int ball_choice_mode;
int ball_content[MM_MAX_BALL_CONTENTS];
+ boolean rotate_ball_content;
+ boolean explode_ball;
short field[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
};
short field[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
};
@@
-194,8
+201,10
@@
struct EngineSnapshotInfo_MM
short Box[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
short Angle[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
short Box[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
short Angle[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
- short LX,LY, XS,YS, ELX,ELY;
- short CT,Ct;
+ short LX, LY;
+ short XS, YS;
+ short ELX, ELY;
+ short CT, Ct;
int last_LX, last_LY, last_hit_mask;
int hold_x, hold_y;
int last_LX, last_LY, last_hit_mask;
int hold_x, hold_y;