return hash;
}
+unsigned int get_hash_from_integer(void *key)
+{
+ unsigned int hash = PTR_TO_UINT(key);
+
+ return hash;
+}
+
int hash_key_strings_are_equal(void *key1, void *key2)
{
return (strEqual((char *)key1, (char *)key2));
}
+int hash_key_integers_are_equal(void *key1, void *key2)
+{
+ return (key1 == 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");
if (hash == NULL)
return;
- hashtable_destroy(hash, 1); // 1 == also free values stored in hash
+ hashtable_destroy(hash);
}
char *getHashEntry(SetupFileHash *hash, char *token)
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
#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;
{ 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" },
*(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:
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:
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: