| … | |
… | |
| 374 | /* |
374 | /* |
| 375 | * get_nearest_part(multi-object, object 2) returns the part of the |
375 | * get_nearest_part(multi-object, object 2) returns the part of the |
| 376 | * multi-object 1 which is closest to the second object. |
376 | * multi-object 1 which is closest to the second object. |
| 377 | * If it's not a multi-object, it is returned. |
377 | * If it's not a multi-object, it is returned. |
| 378 | */ |
378 | */ |
| 379 | |
|
|
| 380 | object * |
379 | object * |
| 381 | get_nearest_part (object *op, const object *pl) |
380 | get_nearest_part (object *op, const object *pl) |
| 382 | { |
381 | { |
| 383 | object *tmp, *closest; |
382 | object *tmp, *closest; |
| 384 | int last_dist, i; |
383 | int last_dist, i; |
| … | |
… | |
| 429 | } |
428 | } |
| 430 | |
429 | |
| 431 | /* |
430 | /* |
| 432 | * Sets the owner and sets the skill and exp pointers to owner's current |
431 | * Sets the owner and sets the skill and exp pointers to owner's current |
| 433 | * skill and experience objects. |
432 | * skill and experience objects. |
|
|
433 | * ACTUALLY NO! investigate! TODO |
| 434 | */ |
434 | */ |
| 435 | void |
435 | void |
| 436 | object::set_owner (object *owner) |
436 | object::set_owner (object *owner) |
| 437 | { |
437 | { |
|
|
438 | // allow objects which own objects |
| 438 | if (!owner) |
439 | if (owner) |
| 439 | return; |
|
|
| 440 | |
|
|
| 441 | /* next line added to allow objects which own objects */ |
|
|
| 442 | /* Add a check for ownercounts in here, as I got into an endless loop |
|
|
| 443 | * with the fireball owning a poison cloud which then owned the |
|
|
| 444 | * fireball. I believe that was caused by one of the objects getting |
|
|
| 445 | * freed and then another object replacing it. Since the ownercounts |
|
|
| 446 | * didn't match, this check is valid and I believe that cause is valid. |
|
|
| 447 | */ |
|
|
| 448 | while (owner->owner) |
440 | while (owner->owner) |
| 449 | owner = owner->owner; |
441 | owner = owner->owner; |
| 450 | |
442 | |
| 451 | this->owner = owner; |
443 | this->owner = owner; |
| 452 | } |
444 | } |
| 453 | |
445 | |
| 454 | int |
446 | int |
| … | |
… | |
| 586 | object::copy_to (object *dst) |
578 | object::copy_to (object *dst) |
| 587 | { |
579 | { |
| 588 | *dst = *this; |
580 | *dst = *this; |
| 589 | |
581 | |
| 590 | if (speed < 0) |
582 | if (speed < 0) |
| 591 | dst->speed_left = speed_left - rndm (); |
583 | dst->speed_left -= rndm (); |
| 592 | |
584 | |
| 593 | dst->set_speed (dst->speed); |
585 | dst->set_speed (dst->speed); |
| 594 | } |
586 | } |
| 595 | |
587 | |
| 596 | void |
588 | void |
| … | |
… | |
| 923 | |
915 | |
| 924 | if (!freed_map) |
916 | if (!freed_map) |
| 925 | { |
917 | { |
| 926 | freed_map = new maptile; |
918 | freed_map = new maptile; |
| 927 | |
919 | |
|
|
920 | freed_map->path = "<freed objects map>"; |
| 928 | freed_map->name = "/internal/freed_objects_map"; |
921 | freed_map->name = "/internal/freed_objects_map"; |
| 929 | freed_map->width = 3; |
922 | freed_map->width = 3; |
| 930 | freed_map->height = 3; |
923 | freed_map->height = 3; |
| 931 | |
924 | |
| 932 | freed_map->alloc (); |
925 | freed_map->alloc (); |
| … | |
… | |
| 1238 | |
1231 | |
| 1239 | object *top, *floor = NULL; |
1232 | object *top, *floor = NULL; |
| 1240 | |
1233 | |
| 1241 | op->remove (); |
1234 | op->remove (); |
| 1242 | |
1235 | |
| 1243 | if (out_of_map (m, op->x, op->y)) |
|
|
| 1244 | { |
|
|
| 1245 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
| 1246 | #ifdef MANY_CORES |
|
|
| 1247 | /* Better to catch this here, as otherwise the next use of this object |
|
|
| 1248 | * is likely to cause a crash. Better to find out where it is getting |
|
|
| 1249 | * improperly inserted. |
|
|
| 1250 | */ |
|
|
| 1251 | abort (); |
|
|
| 1252 | #endif |
|
|
| 1253 | return op; |
|
|
| 1254 | } |
|
|
| 1255 | |
|
|
| 1256 | if (object *more = op->more) |
|
|
| 1257 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
| 1258 | return 0; |
|
|
| 1259 | |
|
|
| 1260 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
| 1261 | |
|
|
| 1262 | /* Ideally, the caller figures this out. However, it complicates a lot |
1236 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1263 | * of areas of callers (eg, anything that uses find_free_spot would now |
1237 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1264 | * need extra work |
1238 | * need extra work |
| 1265 | */ |
1239 | */ |
| 1266 | if (!xy_normalise (m, op->x, op->y)) |
1240 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1241 | { |
|
|
1242 | op->destroy (); |
| 1267 | return 0; |
1243 | return 0; |
|
|
1244 | } |
|
|
1245 | |
|
|
1246 | if (object *more = op->more) |
|
|
1247 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
1248 | return 0; |
|
|
1249 | |
|
|
1250 | CLEAR_FLAG (op, FLAG_REMOVED); |
| 1268 | |
1251 | |
| 1269 | op->map = m; |
1252 | op->map = m; |
| 1270 | mapspace &ms = op->ms (); |
1253 | mapspace &ms = op->ms (); |
| 1271 | |
1254 | |
| 1272 | /* this has to be done after we translate the coordinates. |
1255 | /* this has to be done after we translate the coordinates. |
