X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=c8cd45eade80078539e0b279bbc61aaadcfb272d;hb=2970e961cdf0ebb1774af7b603e4cacb4dadeda6;hp=a07ee8af5458f10b60cfe66d431ac2372be1e4a1;hpb=c4245ac7001dbd6a10e085ac72962611f43a1e90;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a07ee8af..c8cd45ea 100644
--- a/src/files.c
+++ b/src/files.c
@@ -8081,18 +8081,18 @@ void SaveTape(int nr)
   tape.changed = FALSE;
 }
 
-boolean SaveTapeChecked(int nr)
+static boolean SaveTapeCheckedExt(int nr, char *msg_replace, char *msg_saved)
 {
   char *filename = getTapeFilename(nr);
   boolean new_tape = !fileExists(filename);
   boolean tape_saved = FALSE;
 
-  if (new_tape || Request("Replace old tape?", REQ_ASK))
+  if (new_tape || Request(msg_replace, REQ_ASK))
   {
     SaveTape(nr);
 
     if (new_tape)
-      Request("Tape saved!", REQ_CONFIRM);
+      Request(msg_saved, REQ_CONFIRM);
 
     tape_saved = TRUE;
   }
@@ -8100,6 +8100,17 @@ boolean SaveTapeChecked(int nr)
   return tape_saved;
 }
 
+boolean SaveTapeChecked(int nr)
+{
+  return SaveTapeCheckedExt(nr, "Replace old tape?", "Tape saved!");
+}
+
+boolean SaveTapeChecked_LevelSolved(int nr)
+{
+  return SaveTapeCheckedExt(nr, "Level solved! Replace old tape?",
+			        "Level solved! Tape saved!");
+}
+
 void DumpTape(struct TapeInfo *tape)
 {
   int tape_frame_counter;
@@ -9752,22 +9763,34 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   /* (eg, init "menu.line_spacing.INFO[XXX]" from "menu.line_spacing.INFO") */
   for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++)
   {
-    char *value_1 = getHashEntry(setup_file_hash,"menu.paragraph_spacing.INFO");
-    char *value_2 = getHashEntry(setup_file_hash,"menu.headline1_spacing.INFO");
-    char *value_3 = getHashEntry(setup_file_hash,"menu.headline2_spacing.INFO");
-    char *value_4 = getHashEntry(setup_file_hash,"menu.line_spacing.INFO");
-    char *value_5 = getHashEntry(setup_file_hash,"menu.extra_spacing.INFO");
+    char *value_1 = getHashEntry(setup_file_hash,"menu.left_spacing.INFO");
+    char *value_2 = getHashEntry(setup_file_hash,"menu.right_spacing.INFO");
+    char *value_3 = getHashEntry(setup_file_hash,"menu.top_spacing.INFO");
+    char *value_4 = getHashEntry(setup_file_hash,"menu.bottom_spacing.INFO");
+    char *value_5 = getHashEntry(setup_file_hash,"menu.paragraph_spacing.INFO");
+    char *value_6 = getHashEntry(setup_file_hash,"menu.headline1_spacing.INFO");
+    char *value_7 = getHashEntry(setup_file_hash,"menu.headline2_spacing.INFO");
+    char *value_8 = getHashEntry(setup_file_hash,"menu.line_spacing.INFO");
+    char *value_9 = getHashEntry(setup_file_hash,"menu.extra_spacing.INFO");
 
     if (value_1 != NULL)
-      menu.paragraph_spacing_info[i] = get_integer_from_string(value_1);
+      menu.left_spacing_info[i]      = get_integer_from_string(value_1);
     if (value_2 != NULL)
-      menu.headline1_spacing_info[i] = get_integer_from_string(value_2);
+      menu.right_spacing_info[i]     = get_integer_from_string(value_2);
     if (value_3 != NULL)
-      menu.headline2_spacing_info[i] = get_integer_from_string(value_3);
+      menu.top_spacing_info[i]       = get_integer_from_string(value_3);
     if (value_4 != NULL)
-      menu.line_spacing_info[i] = get_integer_from_string(value_4);
+      menu.bottom_spacing_info[i]    = get_integer_from_string(value_4);
     if (value_5 != NULL)
-      menu.extra_spacing_info[i] = get_integer_from_string(value_5);
+      menu.paragraph_spacing_info[i] = get_integer_from_string(value_5);
+    if (value_6 != NULL)
+      menu.headline1_spacing_info[i] = get_integer_from_string(value_6);
+    if (value_7 != NULL)
+      menu.headline2_spacing_info[i] = get_integer_from_string(value_7);
+    if (value_8 != NULL)
+      menu.line_spacing_info[i]      = get_integer_from_string(value_8);
+    if (value_9 != NULL)
+      menu.extra_spacing_info[i]     = get_integer_from_string(value_9);
   }
 
   /* special case: initialize with default values that may be overwritten */