| … | |
… | |
| 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 | remove_ob (tmp); |
60 | tmp->remove (); |
| 61 | free_object (tmp); |
61 | tmp->destroy (0); |
| 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 | } |
| … | |
… | |
| 170 | i = find_first_free_spot (fountain, map, ix, iy); |
170 | i = find_first_free_spot (fountain, map, ix, iy); |
| 171 | tries++; |
171 | tries++; |
| 172 | }; |
172 | }; |
| 173 | if (i == -1) |
173 | if (i == -1) |
| 174 | { /* can't place fountain */ |
174 | { /* can't place fountain */ |
| 175 | free_object (fountain); |
175 | fountain->destroy (0); |
| 176 | free_object (potion); |
176 | potion->destroy (0); |
| 177 | return; |
177 | return; |
| 178 | } |
178 | } |
| 179 | ix += freearr_x[i]; |
179 | ix += freearr_x[i]; |
| 180 | iy += freearr_y[i]; |
180 | iy += freearr_y[i]; |
| 181 | potion->face = fountain->face; |
181 | potion->face = fountain->face; |
