projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved gravity compatibility settings to gravity switch properties page
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 5fb6ecfcea7127a345d3d0024a95519923d0d1ef..4027a6e065a4f23823b7c1050345a08330c9b6a7 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-2311,15
+2311,27
@@
unsigned int get_hash_from_string(void *key)
return hash;
}
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_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 =
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 (new_hash == NULL)
Fail("create_hashtable() failed -- out of memory");
@@
-2332,7
+2344,7
@@
void freeSetupFileHash(SetupFileHash *hash)
if (hash == NULL)
return;
if (hash == NULL)
return;
- hashtable_destroy(hash
, 1); // 1 == also free values stored in hash
+ hashtable_destroy(hash
);
}
char *getHashEntry(SetupFileHash *hash, char *token)
}
char *getHashEntry(SetupFileHash *hash, char *token)
@@
-2358,12
+2370,12
@@
void setHashEntry(SetupFileHash *hash, char *token, char *value)
Fail("cannot insert into hash -- aborting");
}
Fail("cannot insert into hash -- aborting");
}
-
char *
removeHashEntry(SetupFileHash *hash, char *token)
+
void
removeHashEntry(SetupFileHash *hash, char *token)
{
if (hash == NULL)
{
if (hash == NULL)
- return
NULL
;
+ return;
- re
turn re
move_hash_entry(hash, token);
+ remove_hash_entry(hash, token);
}
#if ENABLE_UNUSED_CODE
}
#if ENABLE_UNUSED_CODE