void gd_cave_db_init(void)
{
int i;
- GHashTable *pointers;
+ HashTable *pointers;
boolean lowercase_names = TRUE;
/* TRANSLATORS: some languages (for example, german) do not have lowercase nouns. */
}
/* we do not like generated pixbufs for games. only those that are in the png. */
- if (ABS(gd_elements[i].image_game)>GD_NUM_OF_CELLS_X*GD_NUM_OF_CELLS_Y)
+ if (ABS(gd_elements[i].image_game) > GD_NUM_OF_CELLS_X * GD_NUM_OF_CELLS_Y)
Error("game pixbuf for element %x (%s) bigger than png size", i, gd_elements[i].name);
if (gd_elements[i].image < 0)
Error("editor pixbuf for element %x (%s) should not be animated", i, gd_elements[i].name);
- if (gd_elements[i].properties&P_CAN_BE_HAMMERED && gd_element_get_hammered((GdElement) i) == O_NONE)
+ if (gd_elements[i].properties & P_CAN_BE_HAMMERED && gd_element_get_hammered((GdElement) i) == O_NONE)
Error("element %x (%s) can be hammered, but get_hammered_element does not define another one", i, gd_elements[i].name);
}
*/
/* check the cave property database for faults. */
- pointers = g_hash_table_new(g_direct_hash, g_direct_equal);
+ pointers = create_hashtable(get_hash_from_integer, hash_key_integers_are_equal, NULL, NULL);
for (i = 0; gd_cave_properties[i].identifier != NULL; i++)
{
/* other types */
/* check if its pointer is not the same as another one's */
/* +1 is added so it is never zero */
- if (!(gd_cave_properties[i].flags&GD_DONT_SAVE) && strcmp(gd_cave_properties[i].identifier, "") == 0)
+ if (!(gd_cave_properties[i].flags & GD_DONT_SAVE) && strcmp(gd_cave_properties[i].identifier, "") == 0)
{
Error ("property should have a bdcff identifier: line %d, name %s",
i, gd_cave_properties[i].name);
}
- another_prop = g_hash_table_lookup(pointers, GINT_TO_POINTER(gd_cave_properties[i].offset + 1));
+ another_prop = hashtable_search(pointers, INT_TO_PTR(gd_cave_properties[i].offset + 1));
+
if (another_prop != NULL)
{
Error("property %s has the same pointer as property %s",
else
{
/* value is the identifier, so we can report the OLD one if the check fails */
- g_hash_table_insert(pointers, GINT_TO_POINTER(gd_cave_properties[i].offset + 1),
- gd_cave_properties[i].identifier);
+ hashtable_insert(pointers, INT_TO_PTR(gd_cave_properties[i].offset + 1),
+ gd_cave_properties[i].identifier);
}
}
}
- g_hash_table_destroy(pointers);
+ hashtable_destroy(pointers);
}