projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added separate 3-state type values for "true" and "false" states
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 06190e0b4c71671fb1f1b76989bf5aadb9a9e7f9..a9a62d4e44df0968e1c998a44083949769840471 100644
(file)
--- 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_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 3
4
+#define NUM_LEVELINFO_TOKENS 3
5
static LevelDirTree ldi;
static LevelDirTree ldi;
@@
-4863,7
+4864,8
@@
char *getSetupValue(int type, void *value)
case TYPE_SWITCH_3_STATES:
strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" :
case TYPE_SWITCH_3_STATES:
strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" :
- *(int *)value == FALSE ? "off" : "on"));
+ *(int *)value == MODE_ASK ? "ask" :
+ *(int *)value == MODE_FALSE ? "off" : "on"));
break;
case TYPE_YES_NO:
break;
case TYPE_YES_NO:
@@
-4872,7
+4874,12
@@
char *getSetupValue(int type, void *value)
case TYPE_YES_NO_AUTO:
strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" :
case TYPE_YES_NO_AUTO:
strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" :
- *(int *)value == FALSE ? "no" : "yes"));
+ *(int *)value == MODE_FALSE ? "no" : "yes"));
+ break;
+
+ case TYPE_YES_NO_ASK:
+ strcpy(value_string, (*(int *)value == MODE_ASK ? "ask" :
+ *(int *)value == MODE_FALSE ? "no" : "yes"));
break;
case TYPE_ECS_AGA:
break;
case TYPE_ECS_AGA: