X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=be7447666d29dc90c4e29ca326d51a365bb2c84d;hb=e534f3cf4f5640bf422bb1484e1cc45c0a4b5339;hp=2b43180b42f937d8bb27bf2fb4d4ceea0b6cb754;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 2b43180b..be744766 100644
--- a/src/init.c
+++ b/src/init.c
@@ -4900,6 +4900,7 @@ static void InitGlobal(void)
   }
 
   global.autoplay_leveldir = NULL;
+  global.patchtapes_leveldir = NULL;
   global.convert_leveldir = NULL;
   global.create_images_dir = NULL;
 
@@ -5031,18 +5032,20 @@ static void Execute_Command(char *command)
 
     exit(0);
   }
-  else if (strPrefix(command, "autotest ") ||
-	   strPrefix(command, "autoplay ") ||
+  else if (strPrefix(command, "autoplay ") ||
 	   strPrefix(command, "autoffwd ") ||
-	   strPrefix(command, "autowarp "))
+	   strPrefix(command, "autowarp ") ||
+	   strPrefix(command, "autotest ") ||
+	   strPrefix(command, "autofix "))
   {
-    char *str_ptr = getStringCopy(&command[9]);	// read command parameters
+    char *str_ptr = getStringCopy(&command[8]);	// read command parameters
 
     global.autoplay_mode =
-      (strPrefix(command, "autotest") ? AUTOPLAY_MODE_TEST :
-       strPrefix(command, "autoplay") ? AUTOPLAY_MODE_PLAY :
+      (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, "autofix")  ? AUTOPLAY_MODE_FIX :
        AUTOPLAY_MODE_NONE);
 
     while (*str_ptr != '\0')			// continue parsing string
@@ -5077,9 +5080,68 @@ static void Execute_Command(char *command)
 	str_ptr++;
     }
 
-    if (global.autoplay_mode == AUTOPLAY_MODE_TEST)
+    if (global.autoplay_mode & AUTOPLAY_MODE_WARP_NO_DISPLAY)
       program.headless = TRUE;
   }
+  else if (strPrefix(command, "patch tapes "))
+  {
+    char *str_ptr = getStringCopy(&command[12]); // read command parameters
+
+    // skip leading whitespace
+    while (*str_ptr == ' ' || *str_ptr == '\t')
+      str_ptr++;
+
+    if (*str_ptr == '\0')
+      Error(ERR_EXIT, "cannot find MODE in command '%s'", command);
+
+    global.patchtapes_mode = str_ptr;		// store patch mode
+
+    // advance to next whitespace (or end of string)
+    while (*str_ptr != ' ' && *str_ptr != '\t' && *str_ptr != '\0')
+      str_ptr++;
+
+    while (*str_ptr != '\0')			// continue parsing string
+    {
+      // cut leading whitespace from string, replace it by string terminator
+      while (*str_ptr == ' ' || *str_ptr == '\t')
+	*str_ptr++ = '\0';
+
+      if (*str_ptr == '\0')			// end of string reached
+	break;
+
+      if (global.patchtapes_leveldir == NULL)	// read level set string
+      {
+	global.patchtapes_leveldir = str_ptr;
+	global.patchtapes_all = TRUE;		// default: patch all tapes
+
+	for (i = 0; i < MAX_TAPES_PER_SET; i++)
+	  global.patchtapes_level[i] = FALSE;
+      }
+      else					// read level number string
+      {
+	int level_nr = atoi(str_ptr);		// get level_nr value
+
+	if (level_nr >= 0 && level_nr < MAX_TAPES_PER_SET)
+	  global.patchtapes_level[level_nr] = TRUE;
+
+	global.patchtapes_all = FALSE;
+      }
+
+      // advance string pointer to the next whitespace (or end of string)
+      while (*str_ptr != ' ' && *str_ptr != '\t' && *str_ptr != '\0')
+	str_ptr++;
+    }
+
+    if (global.patchtapes_leveldir == NULL)
+    {
+      if (strEqual(global.patchtapes_mode, "help"))
+	global.patchtapes_leveldir = UNDEFINED_LEVELSET;
+      else
+	Error(ERR_EXIT, "cannot find LEVELDIR in command '%s'", command);
+    }
+
+    program.headless = TRUE;
+  }
   else if (strPrefix(command, "convert "))
   {
     char *str_copy = getStringCopy(strchr(command, ' ') + 1);
@@ -6164,7 +6226,12 @@ void OpenAll(void)
 
   if (global.autoplay_leveldir)
   {
-    AutoPlayTape();
+    AutoPlayTapes();
+    return;
+  }
+  else if (global.patchtapes_leveldir)
+  {
+    PatchTapes();
     return;
   }
   else if (global.convert_leveldir)