X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=b4369b74127571d7d943ddb08dda6deccbd1d058;hb=e4170da05d85029a14fd9ec156a6bb03e7070781;hp=9ed5f715d6847c3f26d4852c2934451a32a356c1;hpb=d09d0cb9fa4e9afaaaa021269bc13ecfd7f51591;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 9ed5f715..b4369b74 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,7 @@ DrawBuffer	       *drawto_field;
 int			game_status = -1;
 int			game_status_last_screen = -1;
 boolean			level_editor_test_game = FALSE;
+boolean			score_info_tape_play = FALSE;
 boolean			network_playing = FALSE;
 
 int			key_joystick_mapping = 0;
@@ -177,6 +178,7 @@ SetupFileHash	       *element_token_hash = NULL;
 SetupFileHash	       *graphic_token_hash = NULL;
 SetupFileHash	       *font_token_hash = NULL;
 SetupFileHash	       *hide_setup_hash = NULL;
+SetupFileHash	       *anim_url_hash = NULL;
 
 
 // ----------------------------------------------------------------------------
@@ -4662,7 +4664,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_kettle",
     "mm_kettle",
-    "magic kettle"
+    "magic cauldron"
   },
   {
     "mm_bomb",
@@ -7494,6 +7496,7 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS_FULL + 1] =
 struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
 {
   { ".[DEFAULT]",		GFX_SPECIAL_ARG_DEFAULT,		},
+  { ".LOADING_INITIAL",		GFX_SPECIAL_ARG_LOADING_INITIAL,	},
   { ".LOADING",			GFX_SPECIAL_ARG_LOADING,		},
   { ".TITLE_INITIAL",		GFX_SPECIAL_ARG_TITLE_INITIAL,		},
   { ".TITLE_INITIAL_1",		GFX_SPECIAL_ARG_TITLE_INITIAL_1,	},
@@ -7524,6 +7527,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
   { ".CRUMBLED",		GFX_SPECIAL_ARG_CRUMBLED,		},
   { ".MAINONLY",		GFX_SPECIAL_ARG_MAINONLY,		},
   { ".NAMESONLY",		GFX_SPECIAL_ARG_NAMESONLY,		},
+  { ".SCORESONLY",		GFX_SPECIAL_ARG_SCORESONLY,		},
   { ".TYPENAME",		GFX_SPECIAL_ARG_TYPENAME,		},
   { ".TYPENAMES",		GFX_SPECIAL_ARG_TYPENAMES,		},
   { ".SUBMENU",			GFX_SPECIAL_ARG_SUBMENU,		},
@@ -7706,10 +7710,11 @@ static void print_usage(void)
 	"\n"
 	"Options:\n"
 	"  -b, --basepath DIRECTORY         alternative base DIRECTORY\n"
-	"  -l, --level DIRECTORY            alternative level DIRECTORY\n"
+	"  -l, --levels DIRECTORY           alternative levels DIRECTORY\n"
 	"  -g, --graphics DIRECTORY         alternative graphics DIRECTORY\n"
 	"  -s, --sounds DIRECTORY           alternative sounds DIRECTORY\n"
 	"  -m, --music DIRECTORY            alternative music DIRECTORY\n"
+	"      --display NR                 open program window on display NR\n"
 	"      --mytapes                    use private tapes for tape tests\n"
 	"  -n, --network                    network multiplayer game\n"
 	"      --serveronly                 only start network server\n"
@@ -7795,9 +7800,6 @@ 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))
@@ -7815,11 +7817,6 @@ 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 &&
       strlen(setup.internal.program_title) > 0)
@@ -7835,10 +7832,10 @@ static void InitProgramConfig(char *command_filename)
       strlen(setup.internal.program_icon_file) > 0)
     program_icon_file = getStringCopy(setup.internal.program_icon_file);
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
-  userdata_subdir = userdata_subdir_unix;
+  userdata_subdir = getStringCat2(".", userdata_basename);
 #else
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif