X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=1a4243f98dae958e5ddf865d0e50399c01a7a229;hp=eafc7dc3b8b55407081a289ec1a1dd01f1f67220;hb=67f3bfab902e53e0dc24a01eb6c0e4d274030a47;hpb=3a9d10b4dd46c7f77112f4497afd09ef59609134

diff --git a/src/main.c b/src/main.c
index eafc7dc3..1a4243f9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // main.c
 // ============================================================================
@@ -33,12 +33,10 @@ int			game_status = -1;
 boolean			game_status_last_screen = -1;
 boolean			level_editor_test_game = FALSE;
 boolean			network_playing = FALSE;
-boolean			network_server = FALSE;
-SDL_Thread	       *server_thread;
 
 int			key_joystick_mapping = 0;
 
-short			Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			Tile[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -6269,6 +6267,16 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "df_wooden_wall",
     "wooden wall (DF style)",
   },
+  {
+    "spring.left",
+    "spring",
+    "spring (starts moving left)"
+  },
+  {
+    "spring.right",
+    "spring",
+    "spring (starts moving right)"
+  },
 
   // --------------------------------------------------------------------------
   // "real" (and therefore drawable) runtime elements
@@ -7611,7 +7619,7 @@ static void print_usage(void)
 	"      --serveronly                 only start network server\n"
 	"  -v, --verbose                    verbose mode\n"
 	"  -V, --version                    show program version\n"
-	"      --debug                      display debugging information\n"
+	"      --debug[=MODE]               show (and limit) debug output\n"
 	"  -e, --execute COMMAND            execute batch COMMAND\n"
 	"\n"
 	"Valid commands for '--execute' option:\n"
@@ -7623,10 +7631,12 @@ static void print_usage(void)
 	"  \"print helptext.conf\"            print default helptext config\n"
 	"  \"dump level FILE\"                dump level data from FILE\n"
 	"  \"dump tape FILE\"                 dump tape data from FILE\n"
-	"  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
 	"  \"autoplay LEVELDIR [NR ...]\"     play level tapes for LEVELDIR\n"
 	"  \"autoffwd LEVELDIR [NR ...]\"     ffwd level tapes for LEVELDIR\n"
 	"  \"autowarp LEVELDIR [NR ...]\"     warp level tapes for LEVELDIR\n"
+	"  \"autotest LEVELDIR [NR ...]\"     test level tapes for LEVELDIR\n"
+	"  \"autofix LEVELDIR [NR ...]\"      test and fix tapes for LEVELDIR\n"
+	"  \"patch tapes MODE LEVELDIR [NR]\" patch level tapes for LEVELDIR\n"
 	"  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
 	"  \"create images DIRECTORY\"        write BMP images to DIRECTORY\n"
 	"  \"create CE image DIRECTORY\"      write BMP image to DIRECTORY\n"
@@ -7689,7 +7699,9 @@ static void InitProgramConfig(char *command_filename)
   char *config_filename = getProgramConfigFilename(command_filename);
   char *userdata_basename = getBaseNameNoSuffix(command_filename);
   char *userdata_subdir;
+#if defined(PLATFORM_UNIX)
   char *userdata_subdir_unix;
+#endif
 
   // read default program config, if existing
   if (fileExists(config_filename))
@@ -7707,8 +7719,10 @@ static void InitProgramConfig(char *command_filename)
     LoadSetupFromFilename(config_filename);
   }
 
+#if defined(PLATFORM_UNIX)
   // set user data directory for Linux/Unix (but not Mac OS X)
   userdata_subdir_unix = getStringCat2(".", userdata_basename);
+#endif
 
   // set program title from potentially redefined program title
   if (setup.internal.program_title != NULL &&