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_file_get_contents()
[rocksndiamonds.git]
/
src
/
game_bd
/
bd_caveobject.c
diff --git
a/src/game_bd/bd_caveobject.c
b/src/game_bd/bd_caveobject.c
index e2814c8bf8f0b6f82e88b00e2b3f924c51f9fefa..01c3caf9b0cd5011624eeefff56d5ac4c00ff694 100644
(file)
--- a/
src/game_bd/bd_caveobject.c
+++ b/
src/game_bd/bd_caveobject.c
@@
-313,7
+313,7
@@
GdObject *gd_object_new_from_string(char *str)
{
object.element = gd_get_element_from_string(elem0);
{
object.element = gd_get_element_from_string(elem0);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-327,7
+327,7
@@
GdObject *gd_object_new_from_string(char *str)
{
object.element = gd_get_element_from_string(elem0);
{
object.element = gd_get_element_from_string(elem0);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-341,7
+341,7
@@
GdObject *gd_object_new_from_string(char *str)
object.type = GD_RECTANGLE;
object.element = gd_get_element_from_string (elem0);
object.type = GD_RECTANGLE;
object.element = gd_get_element_from_string (elem0);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-360,14
+360,14
@@
GdObject *gd_object_new_from_string(char *str)
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
if (paramcount == 5)
{
object.element = object.fill_element = gd_get_element_from_string (elem0);
}
if (paramcount == 5)
{
object.element = object.fill_element = gd_get_element_from_string (elem0);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-387,7
+387,7
@@
GdObject *gd_object_new_from_string(char *str)
object.type = GD_RASTER;
object.element = gd_get_element_from_string (elem0);
object.type = GD_RASTER;
object.element = gd_get_element_from_string (elem0);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-403,7
+403,7
@@
GdObject *gd_object_new_from_string(char *str)
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-418,7
+418,7
@@
GdObject *gd_object_new_from_string(char *str)
object.fill_element = gd_get_element_from_string (elem0);
object.element = gd_get_element_from_string (elem1);
object.fill_element = gd_get_element_from_string (elem0);
object.element = gd_get_element_from_string (elem1);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-433,7
+433,7
@@
GdObject *gd_object_new_from_string(char *str)
object.fill_element = gd_get_element_from_string (elem0);
object.element = gd_get_element_from_string (elem1);
object.fill_element = gd_get_element_from_string (elem0);
object.element = gd_get_element_from_string (elem1);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-463,7
+463,7
@@
GdObject *gd_object_new_from_string(char *str)
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
object.element = gd_get_element_from_string (elem0);
object.fill_element = gd_get_element_from_string (elem1);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
return NULL;
}
return NULL;
@@
-519,7
+519,7
@@
GdObject *gd_object_new_from_string(char *str)
if (l > 10 && l % 2 == 1)
object.element = gd_get_element_from_string(words[l - 1]);
if (l > 10 && l % 2 == 1)
object.element = gd_get_element_from_string(words[l - 1]);
- return g
_memdup
(&object, sizeof (GdObject));
+ return g
et_memcpy
(&object, sizeof (GdObject));
}
/* COPY PASTE OBJECT */
}
/* COPY PASTE OBJECT */
@@
-550,7
+550,7
@@
GdObject *gd_object_new_from_string(char *str)
else
Warn("invalid setting for copypaste flip property: %s", flip);
else
Warn("invalid setting for copypaste flip property: %s", flip);
- return g
_memdup
(&object, sizeof(GdObject));
+ return g
et_memcpy
(&object, sizeof(GdObject));
}
return NULL;
}
return NULL;
@@
-823,7
+823,7
@@
static void draw_join(GdCave *cave, const GdObject *object)
/* create a maze in a boolean **maze. */
/* recursive algorithm. */
/* create a maze in a boolean **maze. */
/* recursive algorithm. */
-static void mazegen(GRand *rand, boolean **maze, int width, int height, int x, int y, int horiz)
+static void mazegen(G
d
Rand *rand, boolean **maze, int width, int height, int x, int y, int horiz)
{
int dirmask = 15;
{
int dirmask = 15;
@@
-833,15
+833,15
@@
static void mazegen(GRand *rand, boolean **maze, int width, int height, int x, i
int dir;
/* horiz or vert */
int dir;
/* horiz or vert */
- dir = g
_rand_int_range(rand, 0, 100) <
horiz ? 2 : 0;
+ dir = g
d_rand_int_range(rand, 0, 100) <
horiz ? 2 : 0;
/* if no horizontal movement possible, choose vertical */
if (dir == 2 && (dirmask & 12) == 0)
dir = 0;
/* if no horizontal movement possible, choose vertical */
if (dir == 2 && (dirmask & 12) == 0)
dir = 0;
- else if (dir == 0 && (dirmask
&
3) == 0) /* and vice versa */
+ else if (dir == 0 && (dirmask
&
3) == 0) /* and vice versa */
dir = 2;
dir = 2;
- dir += g_rand_int_range(rand, 0, 2); /* dir */
+ dir += g
d
_rand_int_range(rand, 0, 2); /* dir */
if (dirmask & (1 << dir))
{
dirmask &= ~(1 << dir);
if (dirmask & (1 << dir))
{
dirmask &= ~(1 << dir);
@@
-884,7
+884,7
@@
static void mazegen(GRand *rand, boolean **maze, int width, int height, int x, i
}
}
}
}
-static void braidmaze(GRand *rand, boolean **maze, int w, int h)
+static void braidmaze(G
d
Rand *rand, boolean **maze, int w, int h)
{
int x, y;
{
int x, y;
@@
-932,7
+932,7
@@
static void braidmaze(GRand *rand, boolean **maze, int w, int h)
if (closed == 3 && dirs != 0)
{
/* make up a random direction, and open in that direction, so dead end is removed */
if (closed == 3 && dirs != 0)
{
/* make up a random direction, and open in that direction, so dead end is removed */
- int dir = closed_dirs[g_rand_int_range(rand, 0, dirs)];
+ int dir = closed_dirs[g
d
_rand_int_range(rand, 0, dirs)];
switch (dir)
{
switch (dir)
{
@@
-960,7
+960,7
@@
static void draw_maze(GdCave *cave, const GdObject *object, int level)
int y2 = object->y2;
int w, h, path, wall;
int xk, yk;
int y2 = object->y2;
int w, h, path, wall;
int xk, yk;
- GRand *rand;
+ G
d
Rand *rand;
int i,j;
/* change coordinates if not in correct order */
int i,j;
/* change coordinates if not in correct order */
@@
-1023,8
+1023,8
@@
static void draw_maze(GdCave *cave, const GdObject *object, int level)
/* start generation, if map is big enough.
otherwise the application would crash, as the editor places maze objects
during mouse click & drag that have no sense */
/* start generation, if map is big enough.
otherwise the application would crash, as the editor places maze objects
during mouse click & drag that have no sense */
- rand = g_rand_new_with_seed(object->seed[level] == -1 ?
-
g
_rand_int(cave->random) : object->seed[level]);
+ rand = g
d
_rand_new_with_seed(object->seed[level] == -1 ?
+
gd
_rand_int(cave->random) : object->seed[level]);
if (w >= 1 && h >= 1)
mazegen(rand, map, w, h, 0, 0, object->horiz);
if (w >= 1 && h >= 1)
mazegen(rand, map, w, h, 0, 0, object->horiz);
@@
-1032,7
+1032,7
@@
static void draw_maze(GdCave *cave, const GdObject *object, int level)
if (object->type == GD_MAZE_BRAID)
braidmaze(rand, map, w, h);
if (object->type == GD_MAZE_BRAID)
braidmaze(rand, map, w, h);
- g_rand_free(rand);
+ g
d
_rand_free(rand);
if (w >= 1 && h >= 1 && object->type == GD_MAZE_UNICURSAL)
{
if (w >= 1 && h >= 1 && object->type == GD_MAZE_UNICURSAL)
{
@@
-1137,17
+1137,17
@@
static void draw_random_fill(GdCave *cave, const GdObject *object, int level)
int y1 = object->y1;
int x2 = object->x2;
int y2 = object->y2;
int y1 = object->y1;
int x2 = object->x2;
int y2 = object->y2;
- GRand *rand;
+ G
d
Rand *rand;
GdC64RandomGenerator c64_rand;
guint32 seed;
/* -1 means that it should be different every time played. */
if (object->seed[level] == -1)
GdC64RandomGenerator c64_rand;
guint32 seed;
/* -1 means that it should be different every time played. */
if (object->seed[level] == -1)
- seed = g_rand_int(cave->random);
+ seed = g
d
_rand_int(cave->random);
else
seed = object->seed[level];
else
seed = object->seed[level];
- rand = g_rand_new_with_seed(seed);
+ rand = g
d
_rand_new_with_seed(seed);
/* for c64 random, use the 2*8 lsb. */
gd_c64_random_set_seed(&c64_rand, seed / 256 % 256, seed % 256);
/* for c64 random, use the 2*8 lsb. */
gd_c64_random_set_seed(&c64_rand, seed / 256 % 256, seed % 256);
@@
-1178,7
+1178,7
@@
static void draw_random_fill(GdCave *cave, const GdObject *object, int level)
randm = gd_c64_random(&c64_rand);
else
/* use the much better glib random generator */
randm = gd_c64_random(&c64_rand);
else
/* use the much better glib random generator */
- randm = g_rand_int_range(rand, 0, 256);
+ randm = g
d
_rand_int_range(rand, 0, 256);
element = object->fill_element;
if (randm < object->random_fill_probability[0])
element = object->fill_element;
if (randm < object->random_fill_probability[0])
@@
-1196,7
+1196,7
@@
static void draw_random_fill(GdCave *cave, const GdObject *object, int level)
}
}
}
}
- g_rand_free(rand);
+ g
d
_rand_free(rand);
}
}
@@
-1321,14
+1321,14
@@
GdCave *gd_cave_new_rendered(const GdCave *data, const int level, const guint32
GdCave *cave;
GdElement element;
int x, y;
GdCave *cave;
GdElement element;
int x, y;
-
G
List *iter;
+ List *iter;
/* make a copy */
cave = gd_cave_new_from_cave(data);
cave->rendered = level + 1;
cave->render_seed = seed;
/* make a copy */
cave = gd_cave_new_from_cave(data);
cave->rendered = level + 1;
cave->render_seed = seed;
- cave->random = g_rand_new_with_seed(cave->render_seed);
+ cave->random = g
d
_rand_new_with_seed(cave->render_seed);
/* maps needed during drawing and gameplay */
cave->objects_order = gd_cave_map_new(cave, gpointer);
/* maps needed during drawing and gameplay */
cave->objects_order = gd_cave_map_new(cave, gpointer);
@@
-1356,8
+1356,8
@@
GdCave *gd_cave_new_rendered(const GdCave *data, const int level, const guint32
/* IF CAVE HAS NO MAP, USE THE RANDOM NUMBER GENERATOR */
/* init c64 randomgenerator */
if (data->level_rand[level] < 0)
/* IF CAVE HAS NO MAP, USE THE RANDOM NUMBER GENERATOR */
/* init c64 randomgenerator */
if (data->level_rand[level] < 0)
- gd_cave_c64_random_set_seed(cave, g_rand_int_range(cave->random, 0, 256),
- g_rand_int_range(cave->random, 0, 256));
+ gd_cave_c64_random_set_seed(cave, g
d
_rand_int_range(cave->random, 0, 256),
+ g
d
_rand_int_range(cave->random, 0, 256));
else
gd_cave_c64_random_set_seed(cave, 0, data->level_rand[level]);
else
gd_cave_c64_random_set_seed(cave, 0, data->level_rand[level]);
@@
-1374,7
+1374,7
@@
GdCave *gd_cave_new_rendered(const GdCave *data, const int level, const guint32
if (data->level_rand[level] < 0)
/* use the much better glib random generator */
if (data->level_rand[level] < 0)
/* use the much better glib random generator */
- randm = g_rand_int_range(cave->random, 0, 256);
+ randm = g
d
_rand_int_range(cave->random, 0, 256);
else
/* use c64 */
randm = gd_cave_c64_random(cave);
else
/* use c64 */
randm = gd_cave_c64_random(cave);
@@
-1425,7
+1425,7
@@
GdCave *gd_cave_new_rendered(const GdCave *data, const int level, const guint32
}
/* render cave objects above random data or map */
}
/* render cave objects above random data or map */
- for (iter = data->objects; iter; iter =
g_
list_next(iter))
+ for (iter = data->objects; iter; iter = list_next(iter))
{
GdObject *object = (GdObject *)iter->data;
{
GdObject *object = (GdObject *)iter->data;
@@
-1475,6
+1475,6
@@
void gd_flatten_cave(GdCave *cave, const int level)
gd_cave_free(rendered);
/* forget objects */
gd_cave_free(rendered);
/* forget objects */
-
g_list_foreach(cave->objects, (GFunc
) free, NULL);
+
list_foreach(cave->objects, (list_fn
) free, NULL);
cave->objects = NULL;
}
cave->objects = NULL;
}