projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced glib function calls to g_list_*()
[rocksndiamonds.git]
/
src
/
game_bd
/
bd_cave.h
diff --git
a/src/game_bd/bd_cave.h
b/src/game_bd/bd_cave.h
index 35b2b80b9d58ad41a71888db18f894aa53a40a37..ca0721ef6a160a602e450ca7a62234775e1c1a5d 100644
(file)
--- a/
src/game_bd/bd_cave.h
+++ b/
src/game_bd/bd_cave.h
@@
-167,6
+167,7
@@
enum _element_property
E_P_BLOWS_UP_FLIES, /* flies blow up, if they touch this */
E_P_EXPLODES_BY_HIT, /* explodes if hit by a stone */
E_P_BLOWS_UP_FLIES, /* flies blow up, if they touch this */
E_P_EXPLODES_BY_HIT, /* explodes if hit by a stone */
+ E_P_EXPLOSION, /* set for every stage of every explosion. */
E_P_EXPLOSION_FIRST_STAGE, /* set for first stage of every explosion.
helps slower/faster explosions changing */
E_P_EXPLOSION_FIRST_STAGE, /* set for first stage of every explosion.
helps slower/faster explosions changing */
@@
-202,6
+203,7
@@
enum _element_property
#define P_BLOWS_UP_FLIES (1 << E_P_BLOWS_UP_FLIES)
#define P_EXPLODES_BY_HIT (1 << E_P_EXPLODES_BY_HIT)
#define P_BLOWS_UP_FLIES (1 << E_P_BLOWS_UP_FLIES)
#define P_EXPLODES_BY_HIT (1 << E_P_EXPLODES_BY_HIT)
+#define P_EXPLOSION (1 << E_P_EXPLOSION)
#define P_EXPLOSION_FIRST_STAGE (1 << E_P_EXPLOSION_FIRST_STAGE)
#define P_NON_EXPLODABLE (1 << E_P_NON_EXPLODABLE)
#define P_EXPLOSION_FIRST_STAGE (1 << E_P_EXPLOSION_FIRST_STAGE)
#define P_NON_EXPLODABLE (1 << E_P_NON_EXPLODABLE)
@@
-375,11
+377,11
@@
typedef struct _gd_cave
/* and this one the highscores */
GdHighScore highscore[GD_HIGHSCORE_NUM];
/* and this one the highscores */
GdHighScore highscore[GD_HIGHSCORE_NUM];
-
GHashTable *tags;
/* stores read-but-not-understood strings from bdcff, so we can save them later. */
+
HashTable *tags;
/* stores read-but-not-understood strings from bdcff, so we can save them later. */
GdElement **map; /* pointer to data for map, non-null if has a map */
GdElement **map; /* pointer to data for map, non-null if has a map */
-
G
List *objects;
-
G
List *replays;
+ List *objects;
+ List *replays;
boolean intermission; /* is this cave an intermission? */
boolean intermission_instantlife; /* one life extra, if the intermission is reached */
boolean intermission; /* is this cave an intermission? */
boolean intermission_instantlife; /* one life extra, if the intermission is reached */
@@
-626,7
+628,7
@@
typedef struct _gd_cave
} GdCave;
} GdCave;
-#define CAVE_OFFSET(property) (
G_
STRUCT_OFFSET(GdCave, property))
+#define CAVE_OFFSET(property) (STRUCT_OFFSET(GdCave, property))
/* arrays for movements */
/* also no1 and bd2 cave data import helpers; line direction coordinates */
/* arrays for movements */
/* also no1 and bd2 cave data import helpers; line direction coordinates */
@@
-642,8
+644,8
@@
GdElement gd_get_element_from_string(const char *string);
void gd_cave_init(void);
/* for cave tags hash table */
void gd_cave_init(void);
/* for cave tags hash table */
-
boolean gd_str_case_equal(gconstpointer s1, gconstpointer
s2);
-
guint gd_str_case_hash(gconstpointer
v);
+
int gd_str_case_equal(void *s1, void *
s2);
+
unsigned int gd_str_case_hash(void *
v);
/* cave highscore functions */
int gd_highscore_compare(gconstpointer a, gconstpointer b);
/* cave highscore functions */
int gd_highscore_compare(gconstpointer a, gconstpointer b);