X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=a9a62d4e44df0968e1c998a44083949769840471;hb=c128739405acf7f7fc4414cb68803e9b966ade69;hp=25ad716ba0785bdca0d87afba3ef817ce610f4cb;hpb=f8be140d8d76ac9240db2d75ac93d800fd4d7878;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 25ad716b..a9a62d4e 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2331,7 +2331,7 @@ int hash_key_integers_are_equal(void *key1, void *key2)
 SetupFileHash *newSetupFileHash(void)
 {
   SetupFileHash *new_hash =
-    create_hashtable(16, 0.75, get_hash_from_string, hash_key_strings_are_equal);
+    create_hashtable(get_hash_from_string, hash_key_strings_are_equal, free, free);
 
   if (new_hash == NULL)
     Fail("create_hashtable() failed -- out of memory");
@@ -2344,7 +2344,7 @@ void freeSetupFileHash(SetupFileHash *hash)
   if (hash == NULL)
     return;
 
-  hashtable_destroy(hash, 1);	// 1 == also free values stored in hash
+  hashtable_destroy(hash);
 }
 
 char *getHashEntry(SetupFileHash *hash, char *token)
@@ -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;
 
@@ -2858,6 +2859,8 @@ static struct TokenInfo levelinfo_tokens[] =
   { TYPE_BOOLEAN,	&ldi.latest_engine,	"latest_engine"		},
   { TYPE_BOOLEAN,	&ldi.level_group,	"level_group"		},
   { TYPE_BOOLEAN,	&ldi.readonly,		"readonly"		},
+  { TYPE_STRING,	&ldi.graphics_set_ecs,	"graphics_set.old"	},
+  { TYPE_STRING,	&ldi.graphics_set_aga,	"graphics_set.new"	},
   { TYPE_STRING,	&ldi.graphics_set_ecs,	"graphics_set.ecs"	},
   { TYPE_STRING,	&ldi.graphics_set_aga,	"graphics_set.aga"	},
   { TYPE_STRING,	&ldi.graphics_set,	"graphics_set"		},
@@ -3230,7 +3233,7 @@ void setSetupInfo(struct TokenInfo *token_info,
       *(boolean *)setup_value = get_boolean_from_string(token_value);
       break;
 
-    case TYPE_SWITCH3:
+    case TYPE_SWITCH_3_STATES:
       *(int *)setup_value = get_switch3_from_string(token_value);
       break;
 
@@ -4859,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 == MODE_AUTO  ? "auto" :
+			    *(int *)value == MODE_ASK   ? "ask" :
+			    *(int *)value == MODE_FALSE ? "off" : "on"));
       break;
 
     case TYPE_YES_NO:
@@ -4869,8 +4873,13 @@ 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 == MODE_AUTO  ? "auto" :
+			    *(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: