fixed compiler warning

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index cca88c17e40621c47608430cd83cfd81db58aab6..d56532d189d8143d7c4ea734a624d615aad68114 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -7166,7 +7166,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_1,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_2,                               TRUE,
@@ -7174,7 +7174,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_2,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_3,                               TRUE,
@@ -7182,7 +7182,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_3,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_4,                               TRUE,
@@ -7190,7 +7190,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_4,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_5,                               TRUE,
@@ -7198,7 +7198,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_5,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_PRE_STONE_1,                             TRUE,
@@ -10710,6 +10710,9 @@ void InitGraphicInfo_BD(void)
 {
   int i, j;
 
+  if (graphic_info == NULL)            // still at startup phase
+    return;
+
   // always start with reliable default values
   for (i = 0; i < O_MAX_ALL; i++)
   {
@@ -11212,6 +11215,26 @@ void InitGraphicInfo_EM(void)
   }
 }
 
+static void CheckSaveEngineSnapshot_BD(boolean frame_max,
+                                      boolean player_moving,
+                                      boolean player_snapping)
+{
+  if (frame_max)
+  {
+    if (!local_player->was_waiting)
+    {
+      if (!CheckSaveEngineSnapshotToList())
+       return;
+
+      local_player->was_waiting = TRUE;
+    }
+  }
+  else if (player_moving || player_snapping)
+  {
+    local_player->was_waiting = FALSE;
+  }
+}
+
 static void CheckSaveEngineSnapshot_EM(int frame,
                                       boolean any_player_moving,
                                       boolean any_player_snapping,
@@ -11269,6 +11292,19 @@ static void CheckSaveEngineSnapshot_MM(boolean element_clicked,
   }
 }
 
+boolean CheckSingleStepMode_BD(boolean frame_max,
+                               boolean player_moving,
+                               boolean player_snapping)
+{
+  if (tape.single_step && tape.recording && !tape.pausing)
+    if (frame_max && FrameCounter > 6)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+  CheckSaveEngineSnapshot_BD(frame_max, player_moving, player_snapping);
+
+  return tape.pausing;
+}
+
 boolean CheckSingleStepMode_EM(int frame,
                               boolean any_player_moving,
                               boolean any_player_snapping,
@@ -11921,11 +11957,6 @@ void OpenURLFromHash(SetupFileHash *hash, int hash_key)
   OpenURL(getHashEntry(hash, int2str(hash_key, 0)));
 }
 
-char *getCurrentLevelsetName(void)
-{
-  return leveldir_current->name;
-}
-
 
 // ============================================================================
 // tests