X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_bd%2Fbd_caveset.c;h=e25fa6263a70c2acdfdec691d5afc1bf80839013;hb=e25acb01746ef65a1c5d4919b0e7c2c5d48b6807;hp=26fe734b53a69ebb6ab275ab64969d010cc1b666;hpb=d2b7c541271aec188c9394af58cdb8d9f66d88b9;p=rocksndiamonds.git diff --git a/src/game_bd/bd_caveset.c b/src/game_bd/bd_caveset.c index 26fe734b..e25fa626 100644 --- a/src/game_bd/bd_caveset.c +++ b/src/game_bd/bd_caveset.c @@ -84,16 +84,9 @@ static GdPropertyDefault caveset_defaults[] = GdCavesetData *gd_caveset_data_new(void) { GdCavesetData *data; - int i; data = checked_calloc(sizeof(GdCavesetData)); - /* create strings */ - for (i = 0; gd_caveset_properties[i].identifier != NULL; i++) - if (gd_caveset_properties[i].type == GD_TYPE_LONGSTRING) - G_STRUCT_MEMBER(GString *, data, gd_caveset_properties[i].offset) = - g_string_new(NULL); - gd_struct_set_defaults_from_array(data, gd_caveset_properties, caveset_defaults); return data; @@ -106,7 +99,7 @@ void gd_caveset_data_free(GdCavesetData *data) /* free strings */ for (i = 0; gd_caveset_properties[i].identifier != NULL; i++) if (gd_caveset_properties[i].type == GD_TYPE_LONGSTRING) - g_string_free(G_STRUCT_MEMBER(GString *, data, gd_caveset_properties[i].offset), TRUE); + checked_free(G_STRUCT_MEMBER(char *, data, gd_caveset_properties[i].offset)); free(data); }