added single-step mode (well, sort of) to MM game engine

diff --git a/src/engines.h b/src/engines.h
index 03baeb8d5b55caeae3630f3fd489e88543fa3df8..9983d559b1b6a28b4eabf5af9a363e0e987c769a 100644 (file)
--- a/src/engines.h
+++ b/src/engines.h
@@ -60,6 +60,8 @@ void SetDrawtoField(int);
 
 int el2img_mm(int);
 
 
 int el2img_mm(int);
 

+void CheckSingleStepMode_MM(boolean);
+

 void getGraphicSource(int, int, Bitmap **, int *, int *);
 void getMiniGraphicSource(int, Bitmap **, int *, int *);
 void getSizedGraphicSource(int, int, int, Bitmap **, int *, int *);
 void getGraphicSource(int, int, Bitmap **, int *, int *);
 void getMiniGraphicSource(int, Bitmap **, int *, int *);
 void getSizedGraphicSource(int, int, int, Bitmap **, int *, int *);

diff --git a/src/events.c b/src/events.c
index 08e571d17427f418b066613bde349cb57c747b6e..ea5312aecb1efbe79e8239e20ab69115c36a74e4 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -401,6 +401,7 @@ void SetPlayerMouseAction(int mx, int my, int button)
 {
   int lx = getLevelFromScreenX(mx);
   int ly = getLevelFromScreenY(my);
 {
   int lx = getLevelFromScreenX(mx);
   int ly = getLevelFromScreenY(my);

+  int new_button = (!local_player->mouse_action.button && button);

 
   ClearPlayerMouseAction();
 
 
   ClearPlayerMouseAction();
 


@@ -413,9 +414,9 @@ void SetPlayerMouseAction(int mx, int my, int button)
 
   if (tape.recording && tape.pausing && tape.use_mouse)
   {
 
   if (tape.recording && tape.pausing && tape.use_mouse)
   {

-    /* prevent button release or motion events from un-pausing a paused game */
-    if (button && !motion_status)
-      TapeTogglePause(TAPE_TOGGLE_MANUAL);
+    /* un-pause a paused game only if mouse button was newly pressed down */
+    if (new_button)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);

   }
 
   SetTileCursorXY(lx, ly);
   }
 
   SetTileCursorXY(lx, ly);

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index ec206faf8f0452278fffed98d8d9e6c14126992e..d34eec08eed4c2c22c2813f252c48de01edafd10 100644 (file)
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -3747,6 +3747,8 @@ void GameActions_MM(struct MouseActionInfo action, boolean warp_mode)
   ClickElement(action.lx, action.ly, action.button);
 
   GameActions_MM_Ext(action, warp_mode);
   ClickElement(action.lx, action.ly, action.button);
 
   GameActions_MM_Ext(action, warp_mode);

+
+  CheckSingleStepMode_MM(action.button == MB_RELEASED);

 }
 
 void MovePacMen()
 }
 
 void MovePacMen()

diff --git a/src/tools.c b/src/tools.c
index d11d99d2effc0b5579c2206374facfdfda83a0d8..777a1a08c833bcde707f13a322b04767195a82f3 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -8747,6 +8747,11 @@ void CheckSaveEngineSnapshot_SP(boolean murphy_is_waiting,
   }
 }
 
   }
 }
 

+void CheckSaveEngineSnapshot_MM(boolean button_released)
+{
+  CheckSaveEngineSnapshotToList();
+}
+

 void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
                            boolean any_player_moving,
                            boolean any_player_snapping,
 void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
                            boolean any_player_moving,
                            boolean any_player_snapping,


@@ -8777,6 +8782,15 @@ void CheckSingleStepMode_SP(boolean murphy_is_waiting,
   CheckSaveEngineSnapshot_SP(murphy_is_waiting, murphy_is_dropping);
 }
 
   CheckSaveEngineSnapshot_SP(murphy_is_waiting, murphy_is_dropping);
 }
 

+void CheckSingleStepMode_MM(boolean button_released)
+{
+  if (tape.single_step && tape.recording && !tape.pausing)
+    if (button_released)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+  CheckSaveEngineSnapshot_MM(button_released);
+}
+

 void getGraphicSource_SP(struct GraphicInfo_SP *g_sp,
                         int graphic, int sync_frame, int x, int y)
 {
 void getGraphicSource_SP(struct GraphicInfo_SP *g_sp,
                         int graphic, int sync_frame, int x, int y)
 {