X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_bd%2Fbd_caveobject.c;h=e2814c8bf8f0b6f82e88b00e2b3f924c51f9fefa;hb=d2b7c541271aec188c9394af58cdb8d9f66d88b9;hp=dc105cdad01f6802a16b9c9fd76cd050e6ab8cf9;hpb=646498771246351aaf243f5ab889179bd9684991;p=rocksndiamonds.git diff --git a/src/game_bd/bd_caveobject.c b/src/game_bd/bd_caveobject.c index dc105cda..e2814c8b 100644 --- a/src/game_bd/bd_caveobject.c +++ b/src/game_bd/bd_caveobject.c @@ -29,134 +29,6 @@ GdObjectLevels gd_levels_mask[] = GD_OBJECT_LEVEL5 }; -/* bdcff text description of object. caller should free string. */ -char *gd_object_get_bdcff(const GdObject *object) -{ - GString *str; - int j; - const char *type; - - switch (object->type) - { - case GD_POINT: - return g_strdup_printf("Point=%d %d %s", - object->x1, object->y1, - gd_elements[object->element].filename); - - case GD_LINE: - return g_strdup_printf("Line=%d %d %d %d %s", - object->x1, object->y1, object->x2, object->y2, - gd_elements[object->element].filename); - - case GD_RECTANGLE: - return g_strdup_printf("Rectangle=%d %d %d %d %s", - object->x1, object->y1, object->x2, object->y2, - gd_elements[object->element].filename); - - case GD_FILLED_RECTANGLE: - /* if elements are not the same */ - if (object->fill_element != object->element) - return g_strdup_printf("FillRect=%d %d %d %d %s %s", - object->x1, object->y1, object->x2, object->y2, - gd_elements[object->element].filename, - gd_elements[object->fill_element].filename); - - /* they are the same */ - return g_strdup_printf("FillRect=%d %d %d %d %s", - object->x1, object->y1, object->x2, object->y2, - gd_elements[object->element].filename); - - case GD_RASTER: - return g_strdup_printf("Raster=%d %d %d %d %d %d %s", - object->x1, object->y1, - (object->x2 - object->x1) / object->dx + 1, - (object->y2 - object->y1) / object->dy + 1, - object->dx, object->dy, - gd_elements[object->element].filename); - - case GD_JOIN: - return g_strdup_printf("Add=%d %d %s %s", - object->dx, object->dy, - gd_elements[object->element].filename, - gd_elements[object->fill_element].filename); - - case GD_FLOODFILL_BORDER: - return g_strdup_printf("BoundaryFill=%d %d %s %s", - object->x1, object->y1, - gd_elements[object->fill_element].filename, - gd_elements[object->element].filename); - - case GD_FLOODFILL_REPLACE: - return g_strdup_printf("FloodFill=%d %d %s %s", - object->x1, object->y1, - gd_elements[object->fill_element].filename, - gd_elements[object->element].filename); - - case GD_MAZE: - case GD_MAZE_UNICURSAL: - case GD_MAZE_BRAID: - switch (object->type) - { - case GD_MAZE: type = "perfect"; break; - case GD_MAZE_UNICURSAL: type = "unicursal"; break; - case GD_MAZE_BRAID: type = "braid"; break; - default: break; - } - - return g_strdup_printf("Maze=%d %d %d %d %d %d %d %d %d %d %d %d %s %s %s", - object->x1, object->y1, object->x2, object->y2, - object->dx, object->dy, - object->horiz, - object->seed[0], - object->seed[1], - object->seed[2], - object->seed[3], - object->seed[4], - gd_elements[object->element].filename, - gd_elements[object->fill_element].filename, type); - - case GD_RANDOM_FILL: - str = g_string_new(NULL); - /* seed and initial fill */ - g_string_append_printf(str, "%s=%d %d %d %d %d %d %d %d %d %s", - object->c64_random ? "RandomFillC64" : "RandomFill", - object->x1, object->y1, object->x2, object->y2, - object->seed[0], - object->seed[1], - object->seed[2], - object->seed[3], - object->seed[4], - gd_elements[object->fill_element].filename); - - for (j = 0; j < 4; j++) - { - if (object->random_fill_probability[j] != 0) - g_string_append_printf(str, " %s %d", - gd_elements[object->random_fill[j]].filename, - object->random_fill_probability[j]); - } - - if (object->element!=O_NONE) - g_string_append_printf(str, " %s", - gd_elements[object->element].filename); - - /* free string but do not free char *; return char *. */ - return g_string_free(str, FALSE); - - case GD_COPY_PASTE: - return g_strdup_printf("CopyPaste=%d %d %d %d %d %d %s %s", - object->x1, object->y1, object->x2, object->y2, - object->dx, object->dy, - object->mirror ? "mirror" : "nomirror", - object->flip?"flip":"noflip"); - - case NONE: - break; - } - - return NULL; -} - /* create an INDIVIDUAL POINT CAVE OBJECT */ GdObject *gd_object_new_point(GdObjectLevels levels, int x, int y, GdElement elem) {