X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame_bd%2Fbd_caveobject.c;h=d76179068a6aa7037e84c1436f4a6e782d473071;hb=01bf4018243f57cefbc0308e49f4dd2d40a0c054;hp=e2814c8bf8f0b6f82e88b00e2b3f924c51f9fefa;hpb=d2b7c541271aec188c9394af58cdb8d9f66d88b9;p=rocksndiamonds.git

diff --git a/src/game_bd/bd_caveobject.c b/src/game_bd/bd_caveobject.c
index e2814c8b..d7617906 100644
--- 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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     return NULL;
@@ -327,7 +327,7 @@ GdObject *gd_object_new_from_string(char *str)
     {
       object.element = gd_get_element_from_string(elem0);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     if (paramcount == 5)
     {
       object.element = object.fill_element = gd_get_element_from_string (elem0);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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);
 
-      return g_memdup(&object, sizeof (GdObject));
+      return getMemCopy(&object, sizeof (GdObject));
     }
 
     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]);
 
-    return g_memdup(&object, sizeof (GdObject));
+    return getMemCopy(&object, sizeof (GdObject));
   }
 
   /* 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);
 
-    return g_memdup(&object, sizeof(GdObject));
+    return getMemCopy(&object, sizeof(GdObject));
   }
 
   return NULL;
@@ -838,7 +838,7 @@ static void mazegen(GRand *rand, boolean **maze, int width, int height, int x, i
     /* 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 += g_rand_int_range(rand, 0, 2);                /* dir */
@@ -1321,7 +1321,7 @@ GdCave *gd_cave_new_rendered(const GdCave *data, const int level, const guint32
   GdCave *cave;
   GdElement element;
   int x, y;
-  GList *iter;
+  List *iter;
 
   /* make a copy */
   cave = gd_cave_new_from_cave(data);
@@ -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 */
-  for (iter = data->objects; iter; iter = g_list_next(iter))
+  for (iter = data->objects; iter; iter = list_next(iter))
   {
     GdObject *object = (GdObject *)iter->data;
 
@@ -1475,6 +1475,6 @@ void gd_flatten_cave(GdCave *cave, const int level)
   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;
 }