removed setup options and variables not used anymore

These setup options and variables have been obsoleted by commit
a3ac3523.

diff --git a/src/files.c b/src/files.c
index b9957edf0d6511feb3159f9395f2aeb1b7236e2e..102753ddec35c6aa7f142c3de443855669776a40 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -10782,14 +10782,6 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.team_mode,                          "team_mode"
   },
-  {
-    TYPE_SWITCH,
-    &setup.handicap,                           "handicap"
-  },
-  {
-    TYPE_SWITCH,
-    &setup.skip_levels,                                "skip_levels"
-  },
   {
     TYPE_SWITCH_3_STATES,
     &setup.allow_skipping_levels,              "allow_skipping_levels"
@@ -11758,8 +11750,6 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->show_titlescreen = TRUE;
   si->quick_doors = FALSE;
   si->team_mode = FALSE;
-  si->handicap = TRUE;
-  si->skip_levels = TRUE;
   si->allow_skipping_levels = STATE_ASK;
   si->increment_levels = TRUE;
   si->auto_play_next_level = TRUE;

diff --git a/src/libgame/system.h b/src/libgame/system.h
index d42662013cd25e61d91a783b131ae5fdab623b1e..aa445738df5110aa4315cf3a9c6cc6a894a19984 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1500,8 +1500,6 @@ struct SetupInfo
   boolean show_titlescreen;
   boolean quick_doors;
   boolean team_mode;
-  boolean handicap;
-  boolean skip_levels;
   boolean allow_skipping_levels;
   boolean increment_levels;
   boolean auto_play_next_level;

diff --git a/src/screens.c b/src/screens.c
index bd5e166e7317a84f6340939c129170378256cc4e..d6a58fba5051b16c39402682e811fe3155a48757 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -7946,12 +7946,7 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,       &setup.multiple_users,          "Multiple Users/Teams:"         },
   { TYPE_YES_NO,       &setup.input_on_focus,          "Only Move Focussed Player:"    },
   { TYPE_SWITCH,       &setup.time_limit,              "Time Limit:"                   },
-#if 1
   { TYPE_YES_NO_ASK,   &setup.allow_skipping_levels,   "Allow Skipping Levels:"        },
-#else
-  { TYPE_SWITCH,       &setup.handicap,                "Force Solving Levels:"         },
-  { TYPE_SWITCH,       &setup.skip_levels,             "Allow Skipping Levels:"        },
-#endif
   { TYPE_SWITCH,       &setup.increment_levels,        "Increment Solved Levels:"      },
   { TYPE_SWITCH,       &setup.auto_play_next_level,    "Auto-play Next Level:"         },
   { TYPE_SWITCH,       &setup.count_score_after_game,  "Count Score After Game:"       },