added alternative (new) door sound
[rocksndiamonds.git] / src / game.c
index c0153bdf452c0cdc55ada397285bbd9bd3681481..c02e590f5fb026eb3d4c59cf09a03725a804b265 100644 (file)
@@ -974,12 +974,13 @@ static struct GamePanelControlInfo game_panel_controls[] =
 #define GAME_CTRL_ID_UNDO              3
 #define GAME_CTRL_ID_REDO              4
 #define GAME_CTRL_ID_SAVE              5
-#define GAME_CTRL_ID_LOAD              6
-#define SOUND_CTRL_ID_MUSIC            7
-#define SOUND_CTRL_ID_LOOPS            8
-#define SOUND_CTRL_ID_SIMPLE           9
+#define GAME_CTRL_ID_PAUSE2            6
+#define GAME_CTRL_ID_LOAD              7
+#define SOUND_CTRL_ID_MUSIC            8
+#define SOUND_CTRL_ID_LOOPS            9
+#define SOUND_CTRL_ID_SIMPLE           10
 
-#define NUM_GAME_BUTTONS               10
+#define NUM_GAME_BUTTONS               11
 
 
 /* forward declaration for internal use */
@@ -3035,7 +3036,15 @@ static void InitGameEngine()
   game.scroll_delay_value =
     MIN(MAX(MIN_SCROLL_DELAY, game.scroll_delay_value), MAX_SCROLL_DELAY);
 
-  FreeEngineSnapshotList();
+  /* ---------- initialize game engine snapshots ---------------------------- */
+  for (i = 0; i < MAX_PLAYERS; i++)
+    game.snapshot.last_action[i] = 0;
+  game.snapshot.changed_action = FALSE;
+  game.snapshot.mode =
+    (strEqual(setup.engine_snapshot_mode, STR_SNAPSHOT_MODE_EVERY_STEP) ?
+     SNAPSHOT_MODE_EVERY_STEP :
+     strEqual(setup.engine_snapshot_mode, STR_SNAPSHOT_MODE_EVERY_MOVE) ?
+     SNAPSHOT_MODE_EVERY_MOVE : SNAPSHOT_MODE_OFF);
 }
 
 int get_num_special_action(int element, int action_first, int action_last)
@@ -3908,8 +3917,6 @@ void InitGame()
 
   /* blit playfield from scroll buffer to normal back buffer for fading in */
   BlitScreenToBitmap(backbuffer);
-
-  redraw_mask |= REDRAW_FROM_BACKBUFFER;
   /* !!! FIX THIS (END) !!! */
 
   FadeIn(REDRAW_FIELD);
@@ -3997,7 +4004,7 @@ void InitGame()
 
   game.restart_level = FALSE;
 
-  SaveEngineSnapshotToList();
+  SaveEngineSnapshotToListInitial();
 }
 
 void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y)
@@ -4384,13 +4391,16 @@ void GameEnd()
 
   local_player->LevelSolved_GameEnd = TRUE;
 
-  CloseDoor(DOOR_CLOSE_1);
+  if (!global.use_envelope_request)
+    CloseDoor(DOOR_CLOSE_1);
 
   if (local_player->LevelSolved_SaveTape)
   {
     SaveTapeChecked(tape.level_nr);    /* ask to save tape */
   }
 
+  CloseDoor(DOOR_CLOSE_ALL);
+
   if (level_editor_test_game)
   {
     game_status = GAME_MODE_MAIN;
@@ -4425,6 +4435,9 @@ void GameEnd()
   {
     game_status = GAME_MODE_SCORES;
 
+    /* needed if different viewport properties defined for scores */
+    ChangeViewportPropertiesIfNeeded();
+
     DrawHallOfFame(hi_pos);
 
     if (raise_level)
@@ -10681,15 +10694,13 @@ static void CheckSaveEngineSnapshot(struct PlayerInfo *player)
   static boolean player_was_snapping = FALSE;
   static boolean player_was_dropping = FALSE;
 
-  if (!tape.recording)
-    return;
-
   if ((!player->is_moving  && player_was_moving) ||
       (player->MovPos == 0 && player_was_moving) ||
       (player->is_snapping && !player_was_snapping) ||
       (player->is_dropping && !player_was_dropping))
   {
-    SaveEngineSnapshotToList();
+    if (!SaveEngineSnapshotToList())
+      return;
 
     player_was_moving = FALSE;
     player_was_snapping = TRUE;
@@ -10958,6 +10969,23 @@ void GameActions()
   byte tape_action[MAX_PLAYERS];
   int i;
 
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    struct PlayerInfo *player = &stored_player[i];
+
+    // allow engine snapshot if movement attempt was stopped
+    if ((game.snapshot.last_action[i] & KEY_MOTION) != 0 &&
+       (player->action & KEY_MOTION) == 0)
+      game.snapshot.changed_action = TRUE;
+
+    // allow engine snapshot in case of snapping/dropping attempt
+    if ((game.snapshot.last_action[i] & KEY_BUTTON) == 0 &&
+       (player->action & KEY_BUTTON) != 0)
+      game.snapshot.changed_action = TRUE;
+
+    game.snapshot.last_action[i] = player->action;
+  }
+
   /* detect endless loops, caused by custom element programming */
   if (recursion_loop_detected && recursion_loop_depth == 0)
   {
@@ -11165,7 +11193,32 @@ void GameActions()
   }
   else
   {
-    GameActions_RND();
+    GameActions_RND_Main();
+  }
+
+  BlitScreenToBitmap(backbuffer);
+
+  CheckLevelTime();
+
+  AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
+
+  if (options.debug)                   /* calculate frames per second */
+  {
+    static unsigned int fps_counter = 0;
+    static int fps_frames = 0;
+    unsigned int fps_delay_ms = Counter() - fps_counter;
+
+    fps_frames++;
+
+    if (fps_delay_ms >= 500)   /* calculate fps every 0.5 seconds */
+    {
+      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
+
+      fps_frames = 0;
+      fps_counter = Counter();
+    }
+
+    redraw_mask |= REDRAW_FPS;
   }
 }
 
@@ -11179,10 +11232,6 @@ void GameActions_EM_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_EM(effective_action, warp_mode);
-
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
 }
 
 void GameActions_SP_Main()
@@ -11195,10 +11244,11 @@ void GameActions_SP_Main()
     effective_action[i] = stored_player[i].effective_action;
 
   GameActions_SP(effective_action, warp_mode);
+}
 
-  CheckLevelTime();
-
-  AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
+void GameActions_RND_Main()
+{
+  GameActions_RND();
 }
 
 void GameActions_RND()
@@ -11700,32 +11750,9 @@ void GameActions_RND()
   }
 #endif
 
-  CheckLevelTime();
-
   DrawAllPlayers();
   PlayAllPlayersSound();
 
-  if (options.debug)                   /* calculate frames per second */
-  {
-    static unsigned int fps_counter = 0;
-    static int fps_frames = 0;
-    unsigned int fps_delay_ms = Counter() - fps_counter;
-
-    fps_frames++;
-
-    if (fps_delay_ms >= 500)   /* calculate fps every 0.5 seconds */
-    {
-      global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
-
-      fps_frames = 0;
-      fps_counter = Counter();
-    }
-
-    redraw_mask |= REDRAW_FPS;
-  }
-
-  AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
-
   if (local_player->show_envelope != 0 && local_player->MovPos == 0)
   {
     ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1);
@@ -11779,16 +11806,16 @@ static boolean AllPlayersInVisibleScreen()
 
 void ScrollLevel(int dx, int dy)
 {
-  int softscroll_offset = (setup.soft_scrolling ? 2 * TILEX_VAR : 0);
+  int scroll_offset = 2 * TILEX_VAR;
   int x, y;
 
   BlitBitmap(drawto_field, drawto_field,
-            FX + TILEX_VAR * (dx == -1) - softscroll_offset,
-            FY + TILEY_VAR * (dy == -1) - softscroll_offset,
-            SXSIZE - TILEX_VAR * (dx != 0) + 2 * softscroll_offset,
-            SYSIZE - TILEY_VAR * (dy != 0) + 2 * softscroll_offset,
-            FX + TILEX_VAR * (dx == 1) - softscroll_offset,
-            FY + TILEY_VAR * (dy == 1) - softscroll_offset);
+            FX + TILEX_VAR * (dx == -1) - scroll_offset,
+            FY + TILEY_VAR * (dy == -1) - scroll_offset,
+            SXSIZE - TILEX_VAR * (dx != 0) + 2 * scroll_offset,
+            SYSIZE - TILEY_VAR * (dy != 0) + 2 * scroll_offset,
+            FX + TILEX_VAR * (dx == 1) - scroll_offset,
+            FY + TILEY_VAR * (dy == 1) - scroll_offset);
 
   if (dx != 0)
   {
@@ -14613,10 +14640,6 @@ ListNode *SaveEngineSnapshotBuffers()
 {
   ListNode *buffers = NULL;
 
-  /* do not save snapshots from editor */
-  if (level_editor_test_game)
-    return NULL;
-
   /* copy some special values to a structure better suited for the snapshot */
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
@@ -14701,11 +14724,6 @@ ListNode *SaveEngineSnapshotBuffers()
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(scroll_x));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(scroll_y));
 
-  /* save level identification information */
-
-  setString(&snapshot_level_identifier, leveldir_current->identifier);
-  snapshot_level_nr = level_nr;
-
 #if 0
   ListNode *node = engine_snapshot_list_rnd;
   int num_bytes = 0;
@@ -14729,14 +14747,45 @@ void SaveEngineSnapshotSingle()
 
   /* finally save all snapshot buffers to single snapshot */
   SaveSnapshotSingle(buffers);
+
+  /* save level identification information */
+  setString(&snapshot_level_identifier, leveldir_current->identifier);
+  snapshot_level_nr = level_nr;
 }
 
-void SaveEngineSnapshotToList()
+static boolean SaveEngineSnapshotToListExt(boolean initial_snapshot)
 {
+  boolean save_snapshot =
+    (initial_snapshot ||
+     (game.snapshot.mode == SNAPSHOT_MODE_EVERY_STEP) ||
+     (game.snapshot.mode == SNAPSHOT_MODE_EVERY_MOVE &&
+      game.snapshot.changed_action));
+
+  game.snapshot.changed_action = FALSE;
+
+  if (game.snapshot.mode == SNAPSHOT_MODE_OFF ||
+      tape.quick_resume ||
+      !save_snapshot)
+    return FALSE;
+
   ListNode *buffers = SaveEngineSnapshotBuffers();
 
   /* finally save all snapshot buffers to snapshot list */
   SaveSnapshotToList(buffers);
+
+  return TRUE;
+}
+
+boolean SaveEngineSnapshotToList()
+{
+  return SaveEngineSnapshotToListExt(FALSE);
+}
+
+void SaveEngineSnapshotToListInitial()
+{
+  FreeEngineSnapshotList();
+
+  SaveEngineSnapshotToListExt(TRUE);
 }
 
 void LoadEngineSnapshotValues()
@@ -14758,26 +14807,31 @@ void LoadEngineSnapshotSingle()
   LoadEngineSnapshotValues();
 }
 
-void LoadEngineSnapshot_Undo()
+void LoadEngineSnapshot_Undo(int steps)
 {
-  LoadSnapshotFromList_Older();
+  LoadSnapshotFromList_Older(steps);
 
   LoadEngineSnapshotValues();
 }
 
-void LoadEngineSnapshot_Redo()
+void LoadEngineSnapshot_Redo(int steps)
 {
-  LoadSnapshotFromList_Newer();
+  LoadSnapshotFromList_Newer(steps);
 
   LoadEngineSnapshotValues();
 }
 
-boolean CheckEngineSnapshot()
+boolean CheckEngineSnapshotSingle()
 {
   return (strEqual(snapshot_level_identifier, leveldir_current->identifier) &&
          snapshot_level_nr == level_nr);
 }
 
+boolean CheckEngineSnapshotList()
+{
+  return CheckSnapshotList();
+}
+
 
 /* ---------- new game button stuff ---------------------------------------- */
 
@@ -14813,6 +14867,10 @@ static struct
     IMG_GAME_BUTTON_GFX_SAVE,          &game.button.save,
     GAME_CTRL_ID_SAVE,                 "save game"
   },
+  {
+    IMG_GAME_BUTTON_GFX_PAUSE2,                &game.button.pause2,
+    GAME_CTRL_ID_PAUSE2,               "pause game"
+  },
   {
     IMG_GAME_BUTTON_GFX_LOAD,          &game.button.load,
     GAME_CTRL_ID_LOAD,                 "load game"
@@ -14863,7 +14921,6 @@ void CreateGameButtons()
     }
 
     if (id == GAME_CTRL_ID_STOP ||
-       id == GAME_CTRL_ID_PAUSE ||
        id == GAME_CTRL_ID_PLAY ||
        id == GAME_CTRL_ID_SAVE ||
        id == GAME_CTRL_ID_LOAD)
@@ -14922,24 +14979,46 @@ void FreeGameButtons()
     FreeGadget(game_gadget[i]);
 }
 
-void MapStopPlayButtons()
+static void MapGameButtonsAtSamePosition(int id)
 {
-  UnmapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
-  UnmapGadget(game_gadget[GAME_CTRL_ID_REDO]);
+  int i;
 
-  MapGadget(game_gadget[GAME_CTRL_ID_STOP]);
-  MapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
+    if (i != id &&
+       gamebutton_info[i].pos->x == gamebutton_info[id].pos->x &&
+       gamebutton_info[i].pos->y == gamebutton_info[id].pos->y)
+      MapGadget(game_gadget[i]);
+}
+
+static void UnmapGameButtonsAtSamePosition(int id)
+{
+  int i;
+
+  for (i = 0; i < NUM_GAME_BUTTONS; i++)
+    if (i != id &&
+       gamebutton_info[i].pos->x == gamebutton_info[id].pos->x &&
+       gamebutton_info[i].pos->y == gamebutton_info[id].pos->y)
+      UnmapGadget(game_gadget[i]);
 }
 
 void MapUndoRedoButtons()
 {
-  UnmapGadget(game_gadget[GAME_CTRL_ID_STOP]);
-  UnmapGadget(game_gadget[GAME_CTRL_ID_PLAY]);
+  UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
+  UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
 
   MapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
   MapGadget(game_gadget[GAME_CTRL_ID_REDO]);
 }
 
+void UnmapUndoRedoButtons()
+{
+  UnmapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
+  UnmapGadget(game_gadget[GAME_CTRL_ID_REDO]);
+
+  MapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
+  MapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
+}
+
 void MapGameButtons()
 {
   int i;
@@ -14948,6 +15027,21 @@ void MapGameButtons()
     if (i != GAME_CTRL_ID_UNDO &&
        i != GAME_CTRL_ID_REDO)
       MapGadget(game_gadget[i]);
+
+  if (setup.show_snapshot_buttons)
+  {
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_SAVE);
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_PAUSE2);
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_LOAD);
+  }
+  else
+  {
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_STOP);
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_PAUSE);
+    UnmapGameButtonsAtSamePosition(GAME_CTRL_ID_PLAY);
+  }
+
+  RedrawGameButtons();
 }
 
 void UnmapGameButtons()
@@ -14978,34 +15072,38 @@ void GameUndoRedoExt()
   RedrawPlayfield();
   UpdateAndDisplayGameControlValues();
 
+  DrawCompleteVideoDisplay();
   DrawVideoDisplay(VIDEO_STATE_TIME_ON, TapeTime);
   DrawVideoDisplay(VIDEO_STATE_FRAME_ON, FrameCounter);
+  DrawVideoDisplay((tape.single_step ? VIDEO_STATE_1STEP_ON :
+                   VIDEO_STATE_1STEP_OFF), 0);
 
   BackToFront();
 }
 
-void GameUndo()
+void GameUndo(int steps)
 {
-  if (!CheckEngineSnapshot())
+  if (!CheckEngineSnapshotList())
     return;
 
-  LoadEngineSnapshot_Undo();
+  LoadEngineSnapshot_Undo(steps);
 
   GameUndoRedoExt();
 }
 
-void GameRedo()
+void GameRedo(int steps)
 {
-  if (!CheckEngineSnapshot())
+  if (!CheckEngineSnapshotList())
     return;
 
-  LoadEngineSnapshot_Redo();
+  LoadEngineSnapshot_Redo(steps);
 
   GameUndoRedoExt();
 }
 
-static void HandleGameButtonsExt(int id)
+static void HandleGameButtonsExt(int id, int button)
 {
+  int steps = BUTTON_STEPSIZE(button);
   boolean handle_game_buttons =
     (game_status == GAME_MODE_PLAYING ||
      (game_status == GAME_MODE_MAIN && tape.show_game_buttons));
@@ -15027,6 +15125,7 @@ static void HandleGameButtonsExt(int id)
       break;
 
     case GAME_CTRL_ID_PAUSE:
+    case GAME_CTRL_ID_PAUSE2:
       if (options.network && game_status == GAME_MODE_PLAYING)
       {
 #if defined(NETWORK_AVALIABLE)
@@ -15052,19 +15151,16 @@ static void HandleGameButtonsExt(int id)
          SendToServer_ContinuePlaying();
        else
 #endif
-       {
-         tape.pausing = FALSE;
-         DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF, 0);
-       }
+         TapeTogglePause(TAPE_TOGGLE_MANUAL);
       }
       break;
 
     case GAME_CTRL_ID_UNDO:
-      GameUndo();
+      GameUndo(steps);
       break;
 
     case GAME_CTRL_ID_REDO:
-      GameRedo();
+      GameRedo(steps);
       break;
 
     case GAME_CTRL_ID_SAVE:
@@ -15121,7 +15217,7 @@ static void HandleGameButtonsExt(int id)
 
 static void HandleGameButtons(struct GadgetInfo *gi)
 {
-  HandleGameButtonsExt(gi->custom_id);
+  HandleGameButtonsExt(gi->custom_id, gi->event.button);
 }
 
 void HandleSoundButtonKeys(Key key)