| … | |
… | |
| 226 | } |
226 | } |
| 227 | else |
227 | else |
| 228 | { |
228 | { |
| 229 | for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) |
229 | for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) |
| 230 | { |
230 | { |
| 231 | tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); |
231 | tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x); |
| 232 | tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); |
232 | tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y); |
| 233 | tmp->map = newmap; |
233 | tmp->map = newmap; |
| 234 | } |
234 | } |
| 235 | |
235 | |
| 236 | insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0); |
236 | insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0); |
| 237 | contr->ranges[range_golem]->direction = |
237 | contr->ranges[range_golem]->direction = |
| 238 | find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); |
238 | find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); |
| 239 | } |
239 | } |
| 240 | } |
240 | } |
| 241 | |
|
|
| 242 | direction = 0; |
|
|
| 243 | |
241 | |
| 244 | /* since the players map is already loaded, we don't need to worry |
242 | /* since the players map is already loaded, we don't need to worry |
| 245 | * about pending objects. |
243 | * about pending objects. |
| 246 | */ |
244 | */ |
| 247 | remove_all_pets (newmap); |
245 | remove_all_pets (newmap); |
