X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=75e691c36555fdd434af328a817ac5be0c482c99;hb=1f8fd7a79343ce670dc62fcb8be48ba78d0c9199;hp=99713e19a4c4b19509a52e1ee029294dfca51fc4;hpb=0eec2fba66b847051c4ad7990d8be75c114e1be7;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 99713e19..75e691c3 100644
--- a/src/files.c
+++ b/src/files.c
@@ -668,6 +668,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     TYPE_INTEGER,			CONF_VALUE_8_BIT(4),
     &li.game_of_life[3],		3
   },
+  {
+    EL_GAME_OF_LIFE,			-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(5),
+    &li.use_life_bugs,			FALSE
+  },
 
   {
     EL_BIOMAZE,				-1,
@@ -6309,6 +6314,10 @@ static void LoadLevel_InitVersion(struct LevelInfo *level)
     level->extra_time_score = level->score[SC_TIME_BONUS];
   }
 
+  /* game logic of "game of life" and "biomaze" was buggy before 4.1.1.1 */
+  if (level->game_version < VERSION_IDENT(4,1,1,1))
+    level->use_life_bugs = TRUE;
+
   if (level->game_version < VERSION_IDENT(3,2,0,7))
   {
     /* default behaviour for snapping was "not continuous" before 3.2.0-7 */
@@ -8356,6 +8365,7 @@ enum
   SETUP_TOKEN_VSYNC_MODE,
   SETUP_TOKEN_ASK_ON_ESCAPE,
   SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR,
+  SETUP_TOKEN_ASK_ON_GAME_OVER,
   SETUP_TOKEN_QUICK_SWITCH,
   SETUP_TOKEN_INPUT_ON_FOCUS,
   SETUP_TOKEN_PREFER_AGA_GRAPHICS,
@@ -8600,6 +8610,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_STRING, &si.vsync_mode,              "vsync_mode"		},
   { TYPE_SWITCH, &si.ask_on_escape,           "ask_on_escape"		},
   { TYPE_SWITCH, &si.ask_on_escape_editor,    "ask_on_escape_editor"	},
+  { TYPE_SWITCH, &si.ask_on_game_over,        "ask_on_game_over"	},
   { TYPE_SWITCH, &si.quick_switch,            "quick_player_switch"	},
   { TYPE_SWITCH, &si.input_on_focus,          "input_on_focus"		},
   { TYPE_SWITCH, &si.prefer_aga_graphics,     "prefer_aga_graphics"	},
@@ -8823,6 +8834,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->vsync_mode = getStringCopy(STR_VSYNC_MODE_DEFAULT);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
+  si->ask_on_game_over = TRUE;
   si->quick_switch = FALSE;
   si->input_on_focus = FALSE;
   si->prefer_aga_graphics = TRUE;