X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=0dc8ea0ddfb9a47b717c9cd35f03a368958a4915;hb=aeffe316860a47217d9b5074ade03cebda8730c9;hp=528404b73f0581196b0e786a493357226862825c;hpb=d0eb0b41da335f373d6b21eda21a437e39241b87;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 528404b7..0dc8ea0d 100644
--- 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;
@@ -5067,15 +5068,20 @@ static void Execute_Command(char *command)
 	   strPrefix(command, "autoffwd ") ||
 	   strPrefix(command, "autowarp ") ||
 	   strPrefix(command, "autotest ") ||
+	   strPrefix(command, "autosave ") ||
+	   strPrefix(command, "autoupload ") ||
 	   strPrefix(command, "autofix "))
   {
-    char *str_ptr = getStringCopy(&command[8]);	// read command parameters
+    char *arg_ptr = strchr(command, ' ');
+    char *str_ptr = getStringCopy(arg_ptr);	// read command parameters
 
     global.autoplay_mode =
       (strPrefix(command, "autoplay") ? AUTOPLAY_MODE_PLAY :
        strPrefix(command, "autoffwd") ? AUTOPLAY_MODE_FFWD :
        strPrefix(command, "autowarp") ? AUTOPLAY_MODE_WARP :
        strPrefix(command, "autotest") ? AUTOPLAY_MODE_TEST :
+       strPrefix(command, "autosave") ? AUTOPLAY_MODE_SAVE :
+       strPrefix(command, "autoupload") ? AUTOPLAY_MODE_UPLOAD :
        strPrefix(command, "autofix")  ? AUTOPLAY_MODE_FIX :
        AUTOPLAY_MODE_NONE);
 
@@ -5197,6 +5203,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 +6313,11 @@ void OpenAll(void)
     CreateLevelSketchImages();
     return;
   }
+  else if (global.create_collect_images_dir)
+  {
+    CreateCollectElementImages();
+    return;
+  }
 
   InitNetworkServer();