| … | |
… | |
| 203 | contr->maplevel = newmap->path; |
203 | contr->maplevel = newmap->path; |
| 204 | contr->count = 0; |
204 | contr->count = 0; |
| 205 | } |
205 | } |
| 206 | |
206 | |
| 207 | /* Update any golems */ |
207 | /* Update any golems */ |
| 208 | if (type == PLAYER && contr->ranges[range_golem]) |
208 | if (type == PLAYER) |
|
|
209 | if (object *golem = contr->ranges[range_golem]) |
| 209 | { |
210 | { |
| 210 | int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE); |
211 | int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); |
| 211 | |
212 | |
| 212 | if (i < 0) |
213 | if (i < 0) |
| 213 | { |
214 | golem->destroy (); |
| 214 | contr->ranges[range_golem]->destroy (); |
|
|
| 215 | contr->ranges[range_golem] = 0; |
|
|
| 216 | } |
|
|
| 217 | else |
215 | else |
| 218 | { |
216 | { |
| 219 | newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]); |
217 | newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); |
| 220 | |
218 | golem->direction = find_dir_2 (x - golem->x, y - golem->y); |
| 221 | contr->ranges[range_golem]->direction = |
|
|
| 222 | find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); |
|
|
| 223 | } |
219 | } |
| 224 | } |
220 | } |
| 225 | |
221 | |
| 226 | /* since the players map is already loaded, we don't need to worry |
222 | /* since the players map is already loaded, we don't need to worry |
| 227 | * about pending objects. |
223 | * about pending objects. |
| 228 | */ |
224 | */ |
| 229 | remove_all_pets (newmap); |
225 | remove_all_pets (newmap); |
