X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=76eea13540a74262bb87b8917c189b04a98c2433;hb=929b071507a0fc9dfd5b667ca563137f65062dd7;hp=e34ed89adcf198497e92c2f8ca948982f1f793c0;hpb=69e00ce68d7e6acf3325adcee8b4a8828fb421d5;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index e34ed89a..76eea135 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)
@@ -2370,12 +2370,12 @@ void setHashEntry(SetupFileHash *hash, char *token, char *value)
       Fail("cannot insert into hash -- aborting");
 }
 
-char *removeHashEntry(SetupFileHash *hash, char *token)
+void removeHashEntry(SetupFileHash *hash, char *token)
 {
   if (hash == NULL)
-    return NULL;
+    return;
 
-  return remove_hash_entry(hash, token);
+  remove_hash_entry(hash, token);
 }
 
 #if ENABLE_UNUSED_CODE
@@ -2858,6 +2858,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"		},
@@ -4860,7 +4862,7 @@ char *getSetupValue(int type, void *value)
       break;
 
     case TYPE_SWITCH3:
-      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
+      strcpy(value_string, (*(int *)value == MODE_AUTO  ? "auto" :
 			    *(int *)value == FALSE ? "off" : "on"));
       break;
 
@@ -4869,7 +4871,7 @@ char *getSetupValue(int type, void *value)
       break;
 
     case TYPE_YES_NO_AUTO:
-      strcpy(value_string, (*(int *)value == AUTO  ? "auto" :
+      strcpy(value_string, (*(int *)value == MODE_AUTO  ? "auto" :
 			    *(int *)value == FALSE ? "no" : "yes"));
       break;