X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=307b78895dd8e13c290095e3402f1355a1d7df23;hb=5c7c1498d0f9560dda7fad6bda93d3c1d373c11f;hp=18fc104924900eed536be361eba8acf20eda4b50;hpb=44420be72ac421fce8a0949ce6bedac304b7c8cc;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 18fc1049..307b7889 100644
--- a/src/files.c
+++ b/src/files.c
@@ -8650,6 +8650,13 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
     strcpy(scores->entry[i].name, EMPTY_PLAYER_NAME);
     scores->entry[i].score = 0;
     scores->entry[i].time = 0;
+
+    scores->entry[i].id = -1;
+    strcpy(scores->entry[i].tape_date,    UNKNOWN_NAME);
+    strcpy(scores->entry[i].platform,     UNKNOWN_NAME);
+    strcpy(scores->entry[i].version,      UNKNOWN_NAME);
+    strcpy(scores->entry[i].country_name, UNKNOWN_NAME);
+    strcpy(scores->entry[i].country_code, "??");
   }
 
   scores->num_entries = 0;
@@ -9443,6 +9450,12 @@ static void LoadServerScoreFromCache(int nr)
     { &score_entry.time,		FALSE,	0			},
     { score_entry.name,			TRUE,	MAX_PLAYER_NAME_LEN	},
     { score_entry.tape_basename,	TRUE,	MAX_FILENAME_LEN	},
+    { score_entry.tape_date,		TRUE,	MAX_ISO_DATE_LEN	},
+    { &score_entry.id,			FALSE,	0			},
+    { score_entry.platform,		TRUE,	MAX_PLATFORM_TEXT_LEN	},
+    { score_entry.version,		TRUE,	MAX_VERSION_TEXT_LEN	},
+    { score_entry.country_code,		TRUE,	MAX_COUNTRY_CODE_LEN	},
+    { score_entry.country_name,		TRUE,	MAX_COUNTRY_NAME_LEN	},
 
     { NULL,				FALSE,	0			}
   };
@@ -9976,6 +9989,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.autorecord,				"automatic_tape_recording"
   },
+  {
+    TYPE_SWITCH,
+    &setup.auto_pause_on_start,			"auto_pause_on_start"
+  },
   {
     TYPE_SWITCH,
     &setup.show_titlescreen,			"show_titlescreen"
@@ -10364,6 +10381,14 @@ static struct TokenInfo shortcut_setup_tokens[] =
     TYPE_KEY_X11,
     &setup.shortcut.load_game,			"shortcut.load_game"
   },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.restart_game,		"shortcut.restart_game"
+  },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.pause_before_end,		"shortcut.pause_before_end"
+  },
   {
     TYPE_KEY_X11,
     &setup.shortcut.toggle_pause,		"shortcut.toggle_pause"
@@ -10786,6 +10811,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
   si->fade_screens = TRUE;
   si->autorecord = TRUE;
+  si->auto_pause_on_start = FALSE;
   si->show_titlescreen = TRUE;
   si->quick_doors = FALSE;
   si->team_mode = FALSE;
@@ -10922,6 +10948,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->shortcut.save_game	= DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game	= DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.restart_game	= DEFAULT_KEY_RESTART_GAME;
+  si->shortcut.pause_before_end	= DEFAULT_KEY_PAUSE_BEFORE_END;
   si->shortcut.toggle_pause	= DEFAULT_KEY_TOGGLE_PAUSE;
 
   si->shortcut.focus_player[0]	= DEFAULT_KEY_FOCUS_PLAYER_1;
@@ -12222,14 +12250,18 @@ static int get_token_parameter_value(char *token, char *value_raw)
   return get_parameter_value(value_raw, suffix, TYPE_INTEGER);
 }
 
-void InitMenuDesignSettings_Static(void)
+void InitMenuDesignSettings_FromHash(SetupFileHash *setup_file_hash,
+				     boolean ignore_defaults)
 {
   int i;
 
-  // always start with reliable default values from static default config
   for (i = 0; image_config_vars[i].token != NULL; i++)
   {
-    char *value = getHashEntry(image_config_hash, image_config_vars[i].token);
+    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
+
+    // (ignore definitions set to "[DEFAULT]" which are already initialized)
+    if (ignore_defaults && strEqual(value, ARG_DEFAULT))
+      continue;
 
     if (value != NULL)
       *image_config_vars[i].value =
@@ -12237,6 +12269,12 @@ void InitMenuDesignSettings_Static(void)
   }
 }
 
+void InitMenuDesignSettings_Static(void)
+{
+  // always start with reliable default values from static default config
+  InitMenuDesignSettings_FromHash(image_config_hash, FALSE);
+}
+
 static void InitMenuDesignSettings_SpecialPreProcessing(void)
 {
   int i;
@@ -13035,15 +13073,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
       *menu_config_players[i].value = TRUE;
 
   // read (and overwrite with) values that may be specified in config file
-  for (i = 0; image_config_vars[i].token != NULL; i++)
-  {
-    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
-
-    // (ignore definitions set to "[DEFAULT]" which are already initialized)
-    if (value != NULL && !strEqual(value, ARG_DEFAULT))
-      *image_config_vars[i].value =
-	get_token_parameter_value(image_config_vars[i].token, value);
-  }
+  InitMenuDesignSettings_FromHash(setup_file_hash, TRUE);
 
   freeSetupFileHash(setup_file_hash);
 }
@@ -13400,6 +13430,18 @@ void LoadMusicInfo(void)
 	new = &(*new)->next;
     }
   }
+
+  // add pointers to previous list nodes
+
+  struct MusicFileInfo *node = music_file_info;
+
+  while (node != NULL)
+  {
+    if (node->next)
+      node->next->prev = node;
+
+    node = node->next;
+  }
 }
 
 static void add_helpanim_entry(int element, int action, int direction,