--- a/project_files/frontlib/model/map.c	Mon Jun 11 00:06:22 2012 +0200
+++ b/project_files/frontlib/model/map.c	Tue Jun 12 11:25:05 2012 +0200
@@ -11,7 +11,7 @@
 	if(!theme) {
 		flib_log_e("null parameter in flib_map_create_regular");
 	} else {
-		flib_map *newmap = calloc(1, sizeof(flib_map));
+		flib_map *newmap = flib_calloc(1, sizeof(flib_map));
 		if(newmap) {
 			newmap->mapgen = MAPGEN_REGULAR;
 			newmap->templateFilter = templateFilter;
@@ -31,7 +31,7 @@
 	if(!theme) {
 		flib_log_e("null parameter in flib_map_create_maze");
 	} else {
-		flib_map *newmap = calloc(1, sizeof(flib_map));
+		flib_map *newmap = flib_calloc(1, sizeof(flib_map));
 		if(newmap) {
 			newmap->mapgen = MAPGEN_MAZE;
 			newmap->mazeSize = mazeSize;
@@ -51,7 +51,7 @@
 	if(!name) {
 		flib_log_e("null parameter in flib_map_create_named");
 	} else {
-		flib_map *newmap = calloc(1, sizeof(flib_map));
+		flib_map *newmap = flib_calloc(1, sizeof(flib_map));
 		if(newmap) {
 			newmap->mapgen = MAPGEN_NAMED;
 			newmap->name = flib_strdupnull(name);
@@ -70,7 +70,7 @@
 	if(!theme || !drawData) {
 		flib_log_e("null parameter in flib_map_create_named");
 	} else {
-		flib_map *newmap = calloc(1, sizeof(flib_map));
+		flib_map *newmap = flib_calloc(1, sizeof(flib_map));
 		if(newmap) {
 			newmap->mapgen = MAPGEN_DRAWN;
 			newmap->drawData = flib_bufdupnull(drawData, drawDataSize);