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_caveset.c
diff --git
a/src/game_bd/bd_caveset.c
b/src/game_bd/bd_caveset.c
index 40078e329b33c9ca2be8693624adb07c66bb64c0..49b6e1003a3ce3af82d66ecc5f23d43429107531 100644
(file)
--- a/
src/game_bd/bd_caveset.c
+++ b/
src/game_bd/bd_caveset.c
@@
-22,7
+22,7
@@
/* this stores the caves. */
/* this stores the caves. */
-
G
List *gd_caveset;
+List *gd_caveset;
/* the data of the caveset: name, highscore, max number of lives, etc. */
GdCavesetData *gd_caveset_data;
/* the data of the caveset: name, highscore, max number of lives, etc. */
GdCavesetData *gd_caveset_data;
@@
-115,8
+115,8
@@
void gd_caveset_clear(void)
{
if (gd_caveset)
{
{
if (gd_caveset)
{
-
g_list_foreach(gd_caveset, (GFunc
) gd_cave_free, NULL);
-
g_
list_free(gd_caveset);
+
list_foreach(gd_caveset, (list_fn
) gd_cave_free, NULL);
+ list_free(gd_caveset);
gd_caveset = NULL;
}
gd_caveset = NULL;
}
@@
-135,13
+135,13
@@
void gd_caveset_clear(void)
/* return number of caves currently in memory. */
int gd_caveset_count(void)
{
/* return number of caves currently in memory. */
int gd_caveset_count(void)
{
- return
g_
list_length(gd_caveset);
+ return list_length(gd_caveset);
}
/* return index of first selectable cave */
static int caveset_first_selectable_cave_index(void)
{
}
/* return index of first selectable cave */
static int caveset_first_selectable_cave_index(void)
{
-
G
List *iter;
+ List *iter;
int i;
for (i = 0, iter = gd_caveset; iter != NULL; i++, iter = iter->next)
int i;
for (i = 0, iter = gd_caveset; iter != NULL; i++, iter = iter->next)
@@
-161,7
+161,7
@@
static int caveset_first_selectable_cave_index(void)
/* return a cave identified by its index */
GdCave *gd_return_nth_cave(const int cave)
{
/* return a cave identified by its index */
GdCave *gd_return_nth_cave(const int cave)
{
- return
g_
list_nth_data(gd_caveset, cave);
+ return list_nth_data(gd_caveset, cave);
}
/* get a selected cave from the loaded caveset (original, unmodified cave) */
}
/* get a selected cave from the loaded caveset (original, unmodified cave) */
@@
-469,7
+469,7
@@
static void brc_import(guint8 *data)
/* append to caveset or forget it. */
if (!only_dirt)
/* append to caveset or forget it. */
if (!only_dirt)
- gd_caveset =
g_
list_append(gd_caveset, cave);
+ gd_caveset = list_append(gd_caveset, cave);
else
gd_cave_free(cave);
}
else
gd_cave_free(cave);
}
@@
-508,7
+508,7
@@
boolean gd_caveset_load_from_file(char *filename)
gsize length;
char *buf;
boolean read;
gsize length;
char *buf;
boolean read;
-
G
List *new_caveset;
+ List *new_caveset;
struct stat st;
if (g_stat(filename, &st) != 0)
struct stat st;
if (g_stat(filename, &st) != 0)
@@
-606,7
+606,7
@@
boolean gd_caveset_load_from_file(char *filename)
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean repair)
{
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean repair)
{
-
G
List *riter;
+ List *riter;
int wrong = 0;
riter = cave->replays;
int wrong = 0;
riter = cave->replays;
@@
-615,7
+615,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
GdReplay *replay = (GdReplay *)riter->data;
guint32 checksum;
GdCave *rendered;
GdReplay *replay = (GdReplay *)riter->data;
guint32 checksum;
GdCave *rendered;
-
G
List *next = riter->next;
+ List *next = riter->next;
rendered = gd_cave_new_rendered(cave, replay->level, replay->seed);
checksum = gd_cave_adler_checksum(rendered);
rendered = gd_cave_new_rendered(cave, replay->level, replay->seed);
checksum = gd_cave_adler_checksum(rendered);
@@
-646,7
+646,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
if (remove)
{
/* may remove */
if (remove)
{
/* may remove */
- cave->replays =
g_
list_remove_link(cave->replays, riter);
+ cave->replays = list_remove_link(cave->replays, riter);
gd_replay_free(replay);
}
}
gd_replay_free(replay);
}
}
@@
-661,7
+661,7
@@
int gd_cave_check_replays(GdCave *cave, boolean report, boolean remove, boolean
boolean gd_caveset_has_replays(void)
{
boolean gd_caveset_has_replays(void)
{
-
G
List *citer;
+ List *citer;
/* for all caves */
for (citer = gd_caveset; citer != NULL; citer = citer->next)
/* for all caves */
for (citer = gd_caveset; citer != NULL; citer = citer->next)