| … | |
… | |
| 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 0 |
|
|
| 1244 | if (!m->active != !op->active) |
|
|
| 1245 | if (m->active) |
|
|
| 1246 | op->activate_recursive (); |
|
|
| 1247 | else |
|
|
| 1248 | op->deactivate_recursive (); |
|
|
| 1249 | #endif |
|
|
| 1250 | |
|
|
| 1251 | if (out_of_map (m, op->x, op->y)) |
|
|
| 1252 | { |
|
|
| 1253 | LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); |
|
|
| 1254 | #ifdef MANY_CORES |
|
|
| 1255 | /* Better to catch this here, as otherwise the next use of this object |
|
|
| 1256 | * is likely to cause a crash. Better to find out where it is getting |
|
|
| 1257 | * improperly inserted. |
|
|
| 1258 | */ |
|
|
| 1259 | abort (); |
|
|
| 1260 | #endif |
|
|
| 1261 | return op; |
|
|
| 1262 | } |
|
|
| 1263 | |
|
|
| 1264 | if (object *more = op->more) |
|
|
| 1265 | if (!insert_ob_in_map (more, m, originator, flag)) |
|
|
| 1266 | return 0; |
|
|
| 1267 | |
|
|
| 1268 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
| 1269 | |
|
|
| 1270 | /* Ideally, the caller figures this out. However, it complicates a lot |
1236 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1271 | * 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 |
| 1272 | * need extra work |
1238 | * need extra work |
| 1273 | */ |
1239 | */ |
| 1274 | if (!xy_normalise (m, op->x, op->y)) |
1240 | if (!xy_normalise (m, op->x, op->y)) |
|
|
1241 | { |
|
|
1242 | op->destroy (); |
| 1275 | 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); |
| 1276 | |
1251 | |
| 1277 | op->map = m; |
1252 | op->map = m; |
| 1278 | mapspace &ms = op->ms (); |
1253 | mapspace &ms = op->ms (); |
| 1279 | |
1254 | |
| 1280 | /* this has to be done after we translate the coordinates. |
1255 | /* this has to be done after we translate the coordinates. |
| … | |
… | |
| 1315 | else |
1290 | else |
| 1316 | { |
1291 | { |
| 1317 | top = ms.bot; |
1292 | top = ms.bot; |
| 1318 | |
1293 | |
| 1319 | /* If there are other objects, then */ |
1294 | /* If there are other objects, then */ |
| 1320 | if ((!(flag & INS_MAP_LOAD)) && top) |
1295 | if (top) |
| 1321 | { |
1296 | { |
| 1322 | object *last = 0; |
1297 | object *last = 0; |
| 1323 | |
1298 | |
| 1324 | /* |
1299 | /* |
| 1325 | * If there are multiple objects on this space, we do some trickier handling. |
1300 | * If there are multiple objects on this space, we do some trickier handling. |
| … | |
… | |
| 1377 | */ |
1352 | */ |
| 1378 | if (last && last->below && last != floor) |
1353 | if (last && last->below && last != floor) |
| 1379 | top = last->below; |
1354 | top = last->below; |
| 1380 | } |
1355 | } |
| 1381 | } /* If objects on this space */ |
1356 | } /* If objects on this space */ |
| 1382 | if (flag & INS_MAP_LOAD) |
|
|
| 1383 | top = ms.top; |
|
|
| 1384 | |
1357 | |
| 1385 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1358 | if (flag & INS_ABOVE_FLOOR_ONLY) |
| 1386 | top = floor; |
1359 | top = floor; |
| 1387 | |
1360 | |
| 1388 | /* Top is the object that our object (op) is going to get inserted above. |
1361 | /* Top is the object that our object (op) is going to get inserted above. |
| … | |
… | |
| 1421 | op->map->touch (); |
1394 | op->map->touch (); |
| 1422 | } |
1395 | } |
| 1423 | |
1396 | |
| 1424 | op->map->dirty = true; |
1397 | op->map->dirty = true; |
| 1425 | |
1398 | |
| 1426 | /* If we have a floor, we know the player, if any, will be above |
|
|
| 1427 | * it, so save a few ticks and start from there. |
|
|
| 1428 | */ |
|
|
| 1429 | if (!(flag & INS_MAP_LOAD)) |
|
|
| 1430 | if (object *pl = ms.player ()) |
1399 | if (object *pl = ms.player ()) |
| 1431 | pl->contr->ns->floorbox_update (); |
1400 | pl->contr->ns->floorbox_update (); |
| 1432 | |
1401 | |
| 1433 | /* If this object glows, it may affect lighting conditions that are |
1402 | /* If this object glows, it may affect lighting conditions that are |
| 1434 | * visible to others on this map. But update_all_los is really |
1403 | * visible to others on this map. But update_all_los is really |
| 1435 | * an inefficient way to do this, as it means los for all players |
1404 | * an inefficient way to do this, as it means los for all players |
| 1436 | * on the map will get recalculated. The players could very well |
1405 | * on the map will get recalculated. The players could very well |
| … | |
… | |
| 1674 | * be != op, if items are merged. -Tero |
1643 | * be != op, if items are merged. -Tero |
| 1675 | */ |
1644 | */ |
| 1676 | object * |
1645 | object * |
| 1677 | object::insert (object *op) |
1646 | object::insert (object *op) |
| 1678 | { |
1647 | { |
| 1679 | object *tmp, *otmp; |
|
|
| 1680 | |
|
|
| 1681 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
1648 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
| 1682 | op->remove (); |
1649 | op->remove (); |
| 1683 | |
1650 | |
| 1684 | if (op->more) |
1651 | if (op->more) |
| 1685 | { |
1652 | { |
| … | |
… | |
| 1687 | return op; |
1654 | return op; |
| 1688 | } |
1655 | } |
| 1689 | |
1656 | |
| 1690 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
1657 | CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); |
| 1691 | CLEAR_FLAG (op, FLAG_REMOVED); |
1658 | CLEAR_FLAG (op, FLAG_REMOVED); |
|
|
1659 | |
| 1692 | if (op->nrof) |
1660 | if (op->nrof) |
| 1693 | { |
1661 | { |
| 1694 | for (tmp = inv; tmp != NULL; tmp = tmp->below) |
1662 | for (object *tmp = inv; tmp; tmp = tmp->below) |
| 1695 | if (object::can_merge (tmp, op)) |
1663 | if (object::can_merge (tmp, op)) |
| 1696 | { |
1664 | { |
| 1697 | /* return the original object and remove inserted object |
1665 | /* return the original object and remove inserted object |
| 1698 | (client needs the original object) */ |
1666 | (client needs the original object) */ |
| 1699 | tmp->nrof += op->nrof; |
1667 | tmp->nrof += op->nrof; |
| … | |
… | |
| 1718 | add_weight (this, op->weight * op->nrof); |
1686 | add_weight (this, op->weight * op->nrof); |
| 1719 | } |
1687 | } |
| 1720 | else |
1688 | else |
| 1721 | add_weight (this, (op->weight + op->carrying)); |
1689 | add_weight (this, (op->weight + op->carrying)); |
| 1722 | |
1690 | |
| 1723 | otmp = this->in_player (); |
1691 | if (object *otmp = this->in_player ()) |
| 1724 | if (otmp && otmp->contr) |
|
|
| 1725 | if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1692 | if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
| 1726 | otmp->update_stats (); |
1693 | otmp->update_stats (); |
| 1727 | |
1694 | |
|
|
1695 | op->owner = 0; // its his/hers now. period. |
| 1728 | op->map = 0; |
1696 | op->map = 0; |
| 1729 | op->env = this; |
1697 | op->env = this; |
| 1730 | op->above = 0; |
1698 | op->above = 0; |
| 1731 | op->below = 0; |
1699 | op->below = 0; |
| 1732 | op->x = 0, op->y = 0; |
1700 | op->x = op->y = 0; |
| 1733 | |
1701 | |
| 1734 | /* reset the light list and los of the players on the map */ |
1702 | /* reset the light list and los of the players on the map */ |
| 1735 | if ((op->glow_radius != 0) && map) |
1703 | if (op->glow_radius && map) |
| 1736 | { |
1704 | { |
| 1737 | #ifdef DEBUG_LIGHTS |
1705 | #ifdef DEBUG_LIGHTS |
| 1738 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1706 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
| 1739 | #endif /* DEBUG_LIGHTS */ |
1707 | #endif /* DEBUG_LIGHTS */ |
| 1740 | if (map->darkness) |
1708 | if (map->darkness) |
| … | |
… | |
| 2020 | * customized, changed states, etc. |
1988 | * customized, changed states, etc. |
| 2021 | */ |
1989 | */ |
| 2022 | int |
1990 | int |
| 2023 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1991 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
| 2024 | { |
1992 | { |
|
|
1993 | int altern[SIZEOFFREE]; |
| 2025 | int index = 0, flag; |
1994 | int index = 0, flag; |
| 2026 | int altern[SIZEOFFREE]; |
|
|
| 2027 | |
1995 | |
| 2028 | for (int i = start; i < stop; i++) |
1996 | for (int i = start; i < stop; i++) |
| 2029 | { |
1997 | { |
| 2030 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1998 | mapxy pos (m, x, y); pos.move (i); |
| 2031 | if (!flag) |
1999 | |
|
|
2000 | if (!pos.normalise ()) |
|
|
2001 | continue; |
|
|
2002 | |
|
|
2003 | mapspace &ms = *pos; |
|
|
2004 | |
|
|
2005 | if (ms.flags () & P_IS_ALIVE) |
|
|
2006 | continue; |
|
|
2007 | |
|
|
2008 | /* However, often |
|
|
2009 | * ob doesn't have any move type (when used to place exits) |
|
|
2010 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
|
|
2011 | */ |
|
|
2012 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
|
|
2013 | { |
| 2032 | altern [index++] = i; |
2014 | altern [index++] = i; |
|
|
2015 | continue; |
|
|
2016 | } |
| 2033 | |
2017 | |
| 2034 | /* Basically, if we find a wall on a space, we cut down the search size. |
2018 | /* Basically, if we find a wall on a space, we cut down the search size. |
| 2035 | * In this way, we won't return spaces that are on another side of a wall. |
2019 | * In this way, we won't return spaces that are on another side of a wall. |
| 2036 | * This mostly work, but it cuts down the search size in all directions - |
2020 | * This mostly work, but it cuts down the search size in all directions - |
| 2037 | * if the space being examined only has a wall to the north and empty |
2021 | * if the space being examined only has a wall to the north and empty |
| 2038 | * spaces in all the other directions, this will reduce the search space |
2022 | * spaces in all the other directions, this will reduce the search space |
| 2039 | * to only the spaces immediately surrounding the target area, and |
2023 | * to only the spaces immediately surrounding the target area, and |
| 2040 | * won't look 2 spaces south of the target space. |
2024 | * won't look 2 spaces south of the target space. |
| 2041 | */ |
2025 | */ |
| 2042 | else if ((flag & P_NO_PASS) && maxfree[i] < stop) |
2026 | if (ms.move_block == MOVE_ALL && maxfree[i] < stop) |
|
|
2027 | { |
| 2043 | stop = maxfree[i]; |
2028 | stop = maxfree[i]; |
|
|
2029 | continue; |
|
|
2030 | } |
|
|
2031 | |
|
|
2032 | /* Note it is intentional that we check ob - the movement type of the |
|
|
2033 | * head of the object should correspond for the entire object. |
|
|
2034 | */ |
|
|
2035 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
|
|
2036 | continue; |
|
|
2037 | |
|
|
2038 | altern [index++] = i; |
| 2044 | } |
2039 | } |
| 2045 | |
2040 | |
| 2046 | if (!index) |
2041 | if (!index) |
| 2047 | return -1; |
2042 | return -1; |
| 2048 | |
2043 | |
| … | |
… | |
| 2057 | */ |
2052 | */ |
| 2058 | int |
2053 | int |
| 2059 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2054 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
| 2060 | { |
2055 | { |
| 2061 | for (int i = 0; i < SIZEOFFREE; i++) |
2056 | for (int i = 0; i < SIZEOFFREE; i++) |
| 2062 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2057 | if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i])) |
| 2063 | return i; |
2058 | return i; |
| 2064 | |
2059 | |
| 2065 | return -1; |
2060 | return -1; |
| 2066 | } |
2061 | } |
| 2067 | |
2062 | |
| … | |
… | |
| 2611 | &name, |
2606 | &name, |
| 2612 | title ? "\",title:\"" : "", |
2607 | title ? "\",title:\"" : "", |
| 2613 | title ? (const char *)title : "", |
2608 | title ? (const char *)title : "", |
| 2614 | flag_desc (flagdesc, 512), type); |
2609 | flag_desc (flagdesc, 512), type); |
| 2615 | |
2610 | |
| 2616 | if (env) |
2611 | if (!this->flag[FLAG_REMOVED] && env) |
| 2617 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2612 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
| 2618 | |
2613 | |
| 2619 | if (map) |
2614 | if (map) |
| 2620 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2615 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
| 2621 | |
2616 | |
| … | |
… | |
| 2730 | force->flag [FLAG_APPLIED] = true; |
2725 | force->flag [FLAG_APPLIED] = true; |
| 2731 | |
2726 | |
| 2732 | insert (force); |
2727 | insert (force); |
| 2733 | } |
2728 | } |
| 2734 | |
2729 | |
|
|
2730 | void |
|
|
2731 | object::play_sound (faceidx sound) const |
|
|
2732 | { |
|
|
2733 | if (!sound) |
|
|
2734 | return; |
|
|
2735 | |
|
|
2736 | if (flag [FLAG_REMOVED]) |
|
|
2737 | return; |
|
|
2738 | |
|
|
2739 | if (env) |
|
|
2740 | { |
|
|
2741 | if (object *pl = in_player ()) |
|
|
2742 | pl->contr->play_sound (sound); |
|
|
2743 | } |
|
|
2744 | else |
|
|
2745 | map->play_sound (sound, x, y); |
|
|
2746 | } |
|
|
2747 | |
