X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fexport.h;h=4c98623de60b0a7b9e1291909e03a0d9b868a97b;hb=b66bf285376f1a2c08ba8f7624fa48ffbcd898a9;hp=21e20cdc8462f0f441ff853b3eef39622fc8f221;hpb=a30a27ce6c313e56cc92dc7183d599f63f8ca1f2;p=rocksndiamonds.git

diff --git a/src/game_mm/export.h b/src/game_mm/export.h
index 21e20cdc..4c98623d 100644
--- a/src/game_mm/export.h
+++ b/src/game_mm/export.h
@@ -27,12 +27,14 @@
 
 #define MM_LEVEL_SCORE_ELEMENTS		16
 
+#define MM_MAX_BALL_CONTENTS		16
+
 #define MM_MAX_LEVEL_NAME_LEN		32
 #define MM_MAX_LEVEL_AUTHOR_LEN		32
 
 
 #define EL_MM_START_1_NATIVE		0
-#define EL_MM_END_1_NATIVE		155
+#define EL_MM_END_1_NATIVE		159
 
 #define EL_MM_CHAR_START_NATIVE		160
 #define EL_MM_CHAR_END_NATIVE		239
@@ -43,9 +45,6 @@
 #define EL_MM_RUNTIME_START_NATIVE	500
 #define EL_MM_RUNTIME_END_NATIVE	504
 
-#define EL_MM_DUMMY_START_NATIVE	700
-#define EL_MM_DUMMY_END_NATIVE		709
-
 // elements to be specially mapped
 #define EL_MM_EMPTY_NATIVE		0
 #define EL_DF_EMPTY_NATIVE		304
@@ -115,6 +114,9 @@ struct LaserInfo
   int fuse_x, fuse_y;
 
   int dest_element;
+  int dest_element_last;
+  int dest_element_last_x;
+  int dest_element_last_y;
   boolean stops_inside_element;
 
   boolean redraw;
@@ -138,10 +140,14 @@ struct GameInfo_MM
   int kettles_still_needed;
   int lights_still_needed;
   int num_keys;
+  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;
+  char *game_over_message;
 
   boolean cheat_no_overload;
   boolean cheat_no_explosion;
@@ -161,7 +167,8 @@ struct LevelInfo_MM
   int time;
   int kettles_needed;
   boolean auto_count_kettles;
-  boolean laser_red, laser_green, laser_blue;
+  boolean mm_laser_red, mm_laser_green, mm_laser_blue;
+  boolean df_laser_red, df_laser_green, df_laser_blue;
   char name[MM_MAX_LEVEL_NAME_LEN + 1];
   char author[MM_MAX_LEVEL_AUTHOR_LEN + 1];
   int score[MM_LEVEL_SCORE_ELEMENTS];
@@ -171,6 +178,12 @@ struct LevelInfo_MM
   int time_ball;
   int time_block;
 
+  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];
 };
 
@@ -184,7 +197,6 @@ struct EngineSnapshotInfo_MM
   short Hit[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
   short Box[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
   short Angle[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
-  short Frame[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
 
   short LX,LY, XS,YS, ELX,ELY;
   short CT,Ct;
@@ -218,7 +230,7 @@ void InitGfxBuffers_MM(void);
 
 void InitGameEngine_MM(void);
 void InitGameActions_MM(void);
-void GameActions_MM(struct MouseActionInfo, boolean);
+void GameActions_MM(struct MouseActionInfo);
 
 void DrawLaser_MM(void);
 void DrawTileCursor_MM(int, boolean);
@@ -239,7 +251,7 @@ void BlitScreenToBitmap_MM(Bitmap *);
 void RedrawPlayfield_MM(void);
 
 void LoadEngineSnapshotValues_MM(void);
-void SaveEngineSnapshotValues_MM(ListNode **);
+void SaveEngineSnapshotValues_MM(void);
 
 int getButtonFromTouchPosition(int, int, int, int);