code cleanup (by using function to reset delay counter)

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 528404b73f0581196b0e786a493357226862825c..6ccc8822c02361fb4c4d51c5e74206857ee1e3c3 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -4664,7 +4664,7 @@ void InitElementPropertiesEngine(int engine_version)
                                                  i == EL_BLACK_ORB));
 
     // ---------- COULD_MOVE_INTO_ACID ----------------------------------------
-    SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (ELEM_IS_PLAYER(i) ||
+    SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (IS_PLAYER_ELEMENT(i) ||
                                              CAN_MOVE(i) ||
                                              IS_CUSTOM_ELEMENT(i)));
 
@@ -4906,6 +4906,7 @@ static void InitGlobal(void)
   global.dumplevel_leveldir = NULL;
   global.dumptape_leveldir = NULL;
   global.create_sketch_images_dir = NULL;
+  global.create_collect_images_dir = NULL;
 
   global.frames_per_second = 0;
   global.show_frames_per_second = FALSE;
@@ -5197,6 +5198,14 @@ static void Execute_Command(char *command)
       Fail("image target directory '%s' not found or not writable",
           global.create_sketch_images_dir);
   }
+  else if (strPrefix(command, "create collect image "))
+  {
+    global.create_collect_images_dir = getStringCopy(&command[21]);
+
+    if (access(global.create_collect_images_dir, W_OK) != 0)
+      Fail("image target directory '%s' not found or not writable",
+          global.create_collect_images_dir);
+  }
   else if (strPrefix(command, "create CE image "))
   {
     CreateCustomElementImages(&command[16]);
@@ -6299,6 +6308,11 @@ void OpenAll(void)
     CreateLevelSketchImages();
     return;
   }
+  else if (global.create_collect_images_dir)
+  {
+    CreateCollectElementImages();
+    return;
+  }
 
   InitNetworkServer();