X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=4104a042e8d1d901404d03998280d938b26feb7b;hb=0f6832ff60f9beba4f1dd347ba9b78aafd806e82;hp=cdf1eea9c8ee09f82c334fac3cdaf60ff935340b;hpb=869cd97d49c2155f59ae0a45f7fd01bb9012c3df;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index cdf1eea9..4104a042 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2831,10 +2831,11 @@ SetupFileHash *loadSetupFileHash(char *filename)
 #define LEVELINFO_TOKEN_HANDICAP		29
 #define LEVELINFO_TOKEN_TIME_LIMIT		30
 #define LEVELINFO_TOKEN_SKIP_LEVELS		31
-#define LEVELINFO_TOKEN_USE_EMC_TILES		32
-#define LEVELINFO_TOKEN_INFO_SCREENS_FROM_MAIN	33
+#define LEVELINFO_TOKEN_ALLOW_SKIPPING_LEVELS	32
+#define LEVELINFO_TOKEN_USE_EMC_TILES		33
+#define LEVELINFO_TOKEN_INFO_SCREENS_FROM_MAIN	34
 
-#define NUM_LEVELINFO_TOKENS			34
+#define NUM_LEVELINFO_TOKENS			35
 
 static LevelDirTree ldi;
 
@@ -3232,8 +3233,8 @@ void setSetupInfo(struct TokenInfo *token_info,
       *(boolean *)setup_value = get_boolean_from_string(token_value);
       break;
 
-    case TYPE_SWITCH3:
-      *(int *)setup_value = get_switch3_from_string(token_value);
+    case TYPE_SWITCH_3_STATES:
+      *(int *)setup_value = get_switch_3_state_from_string(token_value);
       break;
 
     case TYPE_KEY:
@@ -4861,9 +4862,10 @@ char *getSetupValue(int type, void *value)
       strcpy(value_string, (*(boolean *)value ? "on" : "off"));
       break;
 
-    case TYPE_SWITCH3:
-      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
-			    *(int *)value == FALSE ? "off" : "on"));
+    case TYPE_SWITCH_3_STATES:
+      strcpy(value_string, (*(int *)value == STATE_AUTO  ? "auto" :
+			    *(int *)value == STATE_ASK   ? "ask" :
+			    *(int *)value == STATE_FALSE ? "off" : "on"));
       break;
 
     case TYPE_YES_NO:
@@ -4871,12 +4873,17 @@ char *getSetupValue(int type, void *value)
       break;
 
     case TYPE_YES_NO_AUTO:
-      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
-			    *(int *)value == FALSE ? "no" : "yes"));
+      strcpy(value_string, (*(int *)value == STATE_AUTO  ? "auto" :
+			    *(int *)value == STATE_FALSE ? "no" : "yes"));
+      break;
+
+    case TYPE_YES_NO_ASK:
+      strcpy(value_string, (*(int *)value == STATE_ASK   ? "ask" :
+			    *(int *)value == STATE_FALSE ? "no" : "yes"));
       break;
 
     case TYPE_ECS_AGA:
-      strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS"));
+      strcpy(value_string, (*(boolean *)value ? "new" : "old"));
       break;
 
     case TYPE_KEY: