X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=cdf1eea9c8ee09f82c334fac3cdaf60ff935340b;hb=869cd97d49c2155f59ae0a45f7fd01bb9012c3df;hp=25ad716ba0785bdca0d87afba3ef817ce610f4cb;hpb=f8be140d8d76ac9240db2d75ac93d800fd4d7878;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 25ad716b..cdf1eea9 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) @@ -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" },