X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=6adf67db99c57c5a005bbe4185c52b1bfe68714c;hb=bcb1d6118c2d3484e1881a78fd859562745aa553;hp=d266989d445b0497adffca419ef0b0b0c4fb1e29;hpb=367e1c8fd001e62da9db2af6ba9e523cc9165a83;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index d266989d..6adf67db 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)));
 
@@ -5068,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);
 
@@ -5525,7 +5530,7 @@ static void InitGfx(void)
 
   DrawProgramInfo();
 
-  DrawInitText("Loading graphics", 120, FC_GREEN);
+  DrawInitTextHead("Loading graphics");
 
   // initialize settings for busy animation with default values
   int parameter[NUM_GFX_ARGS];
@@ -6191,6 +6196,9 @@ void OpenAll(void)
 
   InitGlobal();			// initialize some global variables
 
+  InitRND(NEW_RANDOMIZE);
+  InitSimpleRandom(NEW_RANDOMIZE);
+
   print_timestamp_time("[init global stuff]");
 
   InitSetup();
@@ -6226,9 +6234,6 @@ void OpenAll(void)
   InitMixer();
   print_timestamp_time("[init setup/config stuff (6)]");
 
-  InitRND(NEW_RANDOMIZE);
-  InitSimpleRandom(NEW_RANDOMIZE);
-
   InitJoysticks();
 
   print_timestamp_time("[init setup/config stuff]");
@@ -6328,6 +6333,8 @@ void OpenAll(void)
 
   DrawMainMenu();
 
+  CheckUploadTapes();
+
 #if 0
   Debug("internal:path", "SDL_GetBasePath() == '%s'",
 	SDL_GetBasePath());