| … | |
… | |
| 49 | object *tmp; |
49 | object *tmp; |
| 50 | |
50 | |
| 51 | for (i = xstart; i < xstart + xsize; i++) |
51 | for (i = xstart; i < xstart + xsize; i++) |
| 52 | for (j = ystart; j < ystart + ysize; j++) |
52 | for (j = ystart; j < ystart + ysize; j++) |
| 53 | { |
53 | { |
| 54 | for (tmp = get_map_ob (map, i, j); tmp != NULL; tmp = tmp->above) |
54 | for (tmp = GET_MAP_OB (map, i, j); tmp != NULL; tmp = tmp->above) |
| 55 | { |
55 | { |
| 56 | if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
56 | if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
| 57 | { |
57 | { |
| 58 | if (tmp->head) |
58 | if (tmp->head) |
| 59 | tmp = tmp->head; |
59 | tmp = tmp->head; |
| 60 | tmp->remove (); |
60 | tmp->remove (); |
| 61 | tmp->destroy (); |
61 | tmp->destroy (); |
| 62 | tmp = get_map_ob (map, i, j); |
62 | tmp = GET_MAP_OB (map, i, j); |
| 63 | } |
63 | } |
| 64 | if (tmp == NULL) |
64 | if (tmp == NULL) |
| 65 | break; |
65 | break; |
| 66 | } |
66 | } |
| 67 | } |
67 | } |
| … | |
… | |
| 83 | nuke_map_region (dest_map, x, y, MAP_WIDTH (in_map), MAP_HEIGHT (in_map)); |
83 | nuke_map_region (dest_map, x, y, MAP_WIDTH (in_map), MAP_HEIGHT (in_map)); |
| 84 | |
84 | |
| 85 | for (i = 0; i < MAP_WIDTH (in_map); i++) |
85 | for (i = 0; i < MAP_WIDTH (in_map); i++) |
| 86 | for (j = 0; j < MAP_HEIGHT (in_map); j++) |
86 | for (j = 0; j < MAP_HEIGHT (in_map); j++) |
| 87 | { |
87 | { |
| 88 | for (tmp = get_map_ob (in_map, i, j); tmp != NULL; tmp = tmp->above) |
88 | for (tmp = GET_MAP_OB (in_map, i, j); tmp != NULL; tmp = tmp->above) |
| 89 | { |
89 | { |
| 90 | /* don't copy things with multiple squares: must be dealt with |
90 | /* don't copy things with multiple squares: must be dealt with |
| 91 | specially. */ |
91 | specially. */ |
| 92 | if (tmp->head != NULL) |
92 | if (tmp->head != NULL) |
| 93 | continue; |
93 | continue; |
