| … | |
… | |
| 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. |
| … | |
… | |
| 1663 | * be != op, if items are merged. -Tero |
1646 | * be != op, if items are merged. -Tero |
| 1664 | */ |
1647 | */ |
| 1665 | object * |
1648 | object * |
| 1666 | object::insert (object *op) |
1649 | object::insert (object *op) |
| 1667 | { |
1650 | { |
| 1668 | object *tmp, *otmp; |
|
|
| 1669 | |
|
|
| 1670 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1651 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
| 1671 | op->remove (); |
1652 | op->remove (); |
| 1672 | |
1653 | |
| 1673 | if (op->more) |
1654 | if (op->more) |
| 1674 | { |
1655 | { |
| … | |
… | |
| 1676 | return op; |
1657 | return op; |
| 1677 | } |
1658 | } |
| 1678 | |
1659 | |
| 1679 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1660 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
| 1680 | CLEAR_FLAG (op, FLAG_REMOVED); |
1661 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1662 | |
| 1681 | if (op->nrof) |
1663 | if (op->nrof) |
| 1682 | { |
1664 | { |
| 1683 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1665 | for (object *tmp = inv; tmp; tmp = tmp->below) |
| 1684 | if (object::can_merge (tmp, op)) |
1666 | if (object::can_merge (tmp, op)) |
| 1685 | { |
1667 | { |
| 1686 | /* return the original object and remove inserted object |
1668 | /* return the original object and remove inserted object |
| 1687 | (client needs the original object) */ |
1669 | (client needs the original object) */ |
| 1688 | tmp->nrof += op->nrof; |
1670 | tmp->nrof += op->nrof; |
| … | |
… | |
| 1707 | add_weight (this, op->weight * op->nrof); |
1689 | add_weight (this, op->weight * op->nrof); |
| 1708 | } |
1690 | } |
| 1709 | else |
1691 | else |
| 1710 | add_weight (this, (op->weight + op->carrying)); |
1692 | add_weight (this, (op->weight + op->carrying)); |
| 1711 | |
1693 | |
| 1712 | otmp = this->in_player (); |
1694 | if (object *otmp = this->in_player ()) |
| 1713 | if (otmp && otmp->contr) |
|
|
| 1714 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1695 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
| 1715 | otmp->update_stats (); |
1696 | otmp->update_stats (); |
| 1716 | |
1697 | |
|
|
1698 | op->owner = 0; // its his/hers now. period. |
| 1717 | op->map = 0; |
1699 | op->map = 0; |
| 1718 | op->env = this; |
1700 | op->env = this; |
| 1719 | op->above = 0; |
1701 | op->above = 0; |
| 1720 | op->below = 0; |
1702 | op->below = 0; |
| 1721 | op->x = 0, op->y = 0; |
1703 | op->x = op->y = 0; |
| 1722 | |
1704 | |
| 1723 | /* reset the light list and los of the players on the map */ |
1705 | /* reset the light list and los of the players on the map */ |
| 1724 | if ((op->glow_radius != 0) && map) |
1706 | if (op->glow_radius && map) |
| 1725 | { |
1707 | { |
| 1726 | #ifdef DEBUG_LIGHTS |
1708 | #ifdef DEBUG_LIGHTS |
| 1727 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1709 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
| 1728 | #endif /* DEBUG_LIGHTS */ |
1710 | #endif /* DEBUG_LIGHTS */ |
| 1729 | if (map->darkness) |
1711 | if (map->darkness) |
| … | |
… | |
| 2014 | int index = 0, flag; |
1996 | int index = 0, flag; |
| 2015 | int altern[SIZEOFFREE]; |
1997 | int altern[SIZEOFFREE]; |
| 2016 | |
1998 | |
| 2017 | for (int i = start; i < stop; i++) |
1999 | for (int i = start; i < stop; i++) |
| 2018 | { |
2000 | { |
| 2019 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2001 | mapxy pos (m, x, y); pos.move (i); |
| 2020 | if (!flag) |
2002 | |
| 2021 | altern [index++] = i; |
2003 | if (!pos.normalise ()) |
|
|
2004 | continue; |
|
|
2005 | |
|
|
2006 | mapspace &ms = *pos; |
|
|
2007 | ms.update (); |
|
|
2008 | |
|
|
2009 | /* However, often |
|
|
2010 | * ob doesn't have any move type (when used to place exits) |
|
|
2011 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2012 | */ |
|
|
2013 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2014 | continue; |
| 2022 | |
2015 | |
| 2023 | /* Basically, if we find a wall on a space, we cut down the search size. |
2016 | /* Basically, if we find a wall on a space, we cut down the search size. |
| 2024 | * In this way, we won't return spaces that are on another side of a wall. |
2017 | * In this way, we won't return spaces that are on another side of a wall. |
| 2025 | * This mostly work, but it cuts down the search size in all directions - |
2018 | * This mostly work, but it cuts down the search size in all directions - |
| 2026 | * if the space being examined only has a wall to the north and empty |
2019 | * if the space being examined only has a wall to the north and empty |
| 2027 | * spaces in all the other directions, this will reduce the search space |
2020 | * spaces in all the other directions, this will reduce the search space |
| 2028 | * to only the spaces immediately surrounding the target area, and |
2021 | * to only the spaces immediately surrounding the target area, and |
| 2029 | * won't look 2 spaces south of the target space. |
2022 | * won't look 2 spaces south of the target space. |
| 2030 | */ |
2023 | */ |
| 2031 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2024 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2025 | { |
| 2032 | stop = maxfree[i]; |
2026 | stop = maxfree[i]; |
|
|
2027 | continue; |
|
|
2028 | } |
|
|
2029 | |
|
|
2030 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2031 | * head of the object should correspond for the entire object. |
|
|
2032 | */ |
|
|
2033 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2034 | continue; |
|
|
2035 | |
|
|
2036 | altern [index++] = i; |
| 2033 | } |
2037 | } |
| 2034 | |
2038 | |
| 2035 | if (!index) |
2039 | if (!index) |
| 2036 | return -1; |
2040 | return -1; |
| 2037 | |
2041 | |
| … | |
… | |
| 2046 | */ |
2050 | */ |
| 2047 | int |
2051 | int |
| 2048 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2052 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
| 2049 | { |
2053 | { |
| 2050 | for (int i = 0; i < SIZEOFFREE; i++) |
2054 | for (int i = 0; i < SIZEOFFREE; i++) |
| 2051 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2055 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
| 2052 | return i; |
2056 | return i; |
| 2053 | |
2057 | |
| 2054 | return -1; |
2058 | return -1; |
| 2055 | } |
2059 | } |
| 2056 | |
2060 | |
| … | |
… | |
| 2600 | &name, |
2604 | &name, |
| 2601 | title ? "\",title:\"" : "", |
2605 | title ? "\",title:\"" : "", |
| 2602 | title ? (const char *)title : "", |
2606 | title ? (const char *)title : "", |
| 2603 | flag_desc (flagdesc, 512), type); |
2607 | flag_desc (flagdesc, 512), type); |
| 2604 | |
2608 | |
| 2605 | if (env) |
2609 | if (!this->flag[FLAG_REMOVED] && env) |
| 2606 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2610 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
| 2607 | |
2611 | |
| 2608 | if (map) |
2612 | if (map) |
| 2609 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2613 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
| 2610 | |
2614 | |
