ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.267 by root, Tue Dec 23 01:51:27 2008 UTC vs.
Revision 1.289 by root, Sun Oct 11 05:31:54 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
32#include <bitset> 32#include <bitset>
33 33
34UUID UUID::cur; 34UUID UUID::cur;
35static uint64_t seq_next_save; 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
37 38
38objectvec objects; 39objectvec objects;
39activevec actives; 40activevec actives;
40 41
41short freearr_x[SIZEOFFREE] = { 42short freearr_x[SIZEOFFREE] = {
… …
323 { 324 {
324 // see if we are in a container of sorts 325 // see if we are in a container of sorts
325 if (env) 326 if (env)
326 { 327 {
327 // the player inventory itself is always visible 328 // the player inventory itself is always visible
328 if (env->type == PLAYER) 329 if (env->is_player ())
329 return env; 330 return env;
330 331
331 // else a player could have our env open 332 // else a player could have our env open
332 object *envest = env->outer_env (); 333 object *envest = env->outer_env_or_self ();
333 334
334 // the player itself is always on a map, so we will find him here 335 // the player itself is always on a map, so we will find him here
335 // even if our inv is in a player. 336 // even if our inv is in a player.
336 if (envest->is_on_map ()) 337 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ()) 338 if (object *pl = envest->ms ().player ())
… …
430 object_freezer freezer; 431 object_freezer freezer;
431 op->write (freezer); 432 op->write (freezer);
432 return freezer.as_string (); 433 return freezer.as_string ();
433} 434}
434 435
436char *
437object::as_string ()
438{
439 return dump_object (this);
440}
441
435/* 442/*
436 * get_nearest_part(multi-object, object 2) returns the part of the 443 * get_nearest_part(multi-object, object 2) returns the part of the
437 * multi-object 1 which is closest to the second object. 444 * multi-object 1 which is closest to the second object.
438 * If it's not a multi-object, it is returned. 445 * If it's not a multi-object, it is returned.
439 */ 446 */
… …
554 update_stats (); 561 update_stats ();
555 562
556 new_draw_info_format (NDI_UNIQUE, 0, this, 563 new_draw_info_format (NDI_UNIQUE, 0, this,
557 "You try to balance all your items at once, " 564 "You try to balance all your items at once, "
558 "but the %s is just too much for your body. " 565 "but the %s is just too much for your body. "
559 "[You need to unapply some items first.]", &ob->name); 566 "[You need to unapply some items first - use the 'body' command to see "
567 "how many items you cna wera on a specific body part.]", &ob->name);
560 return false; 568 return false;
561 } 569 }
562 570
563 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 571 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564 } 572 }
… …
758 else if (action == UP_OBJ_INSERT) 766 else if (action == UP_OBJ_INSERT)
759 { 767 {
760 // this is likely overkill, TODO: revisit (schmorp) 768 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 769 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 770 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 771 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 772 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 773 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 774 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 775 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 776 || (m.move_off | op->move_off ) != m.move_off
… …
791 799
792object::object () 800object::object ()
793{ 801{
794 SET_FLAG (this, FLAG_REMOVED); 802 SET_FLAG (this, FLAG_REMOVED);
795 803
796 expmul = 1.0; 804 //expmul = 1.0; declared const for the time being
797 face = blank_face; 805 face = blank_face;
798} 806}
799 807
800object::~object () 808object::~object ()
801{ 809{
… …
830{ 838{
831 /* If already on active list, don't do anything */ 839 /* If already on active list, don't do anything */
832 if (active) 840 if (active)
833 return; 841 return;
834 842
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838 if (has_active_speed ()) 843 if (has_active_speed ())
844 {
845 if (flag [FLAG_FREED])
846 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
847
839 actives.insert (this); 848 actives.insert (this);
849 }
840} 850}
841 851
842void 852void
843object::activate_recursive () 853object::activate_recursive ()
844{ 854{
… …
962 972
963void 973void
964object::do_destroy () 974object::do_destroy ()
965{ 975{
966 if (flag [FLAG_IS_LINKED]) 976 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 977 remove_link ();
968 978
969 if (flag [FLAG_FRIENDLY]) 979 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 980 remove_friendly_object (this);
971 981
972 remove (); 982 remove ();
… …
1083 if (pl) 1093 if (pl)
1084 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) 1094 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1085 { 1095 {
1086 pl->update_stats (); 1096 pl->update_stats ();
1087 1097
1088 if (glow_radius && pl->is_on_map () && pl->map->darkness) 1098 if (glow_radius && pl->is_on_map ())
1089 update_all_los (pl->map, pl->x, pl->y); 1099 update_all_los (pl->map, pl->x, pl->y);
1090 } 1100 }
1091 } 1101 }
1092 else if (map) 1102 else if (map)
1093 { 1103 {
1094 map->dirty = true; 1104 map->dirty = true;
1095 mapspace &ms = this->ms (); 1105 mapspace &ms = this->ms ();
1096 1106
1097 if (object *pl = ms.player ()) 1107 if (object *pl = ms.player ())
1098 { 1108 {
1099 if (type == PLAYER) // this == pl(!) 1109 if (is_player ())
1100 { 1110 {
1111 if (!flag [FLAG_WIZPASS])
1112 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1113
1101 // leaving a spot always closes any open container on the ground 1114 // leaving a spot always closes any open container on the ground
1102 if (container && !container->env) 1115 if (container && !container->env)
1103 // this causes spurious floorbox updates, but it ensures 1116 // this causes spurious floorbox updates, but it ensures
1104 // that the CLOSE event is being sent. 1117 // that the CLOSE event is being sent.
1105 close_container (); 1118 close_container ();
… …
1165 } 1178 }
1166 1179
1167 last = tmp; 1180 last = tmp;
1168 } 1181 }
1169 1182
1170 if (map->darkness && affects_los ()) 1183 if (affects_los ())
1171 update_all_los (map, x, y); 1184 update_all_los (map, x, y);
1172 } 1185 }
1173} 1186}
1174 1187
1175/* 1188/*
… …
1282 1295
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1296 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1297 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1298 * need extra work
1286 */ 1299 */
1300 maptile *newmap = m;
1287 if (!xy_normalise (m, op->x, op->y)) 1301 if (!xy_normalise (newmap, op->x, op->y))
1288 { 1302 {
1289 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1303 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290 return 0; 1304 return 0;
1291 } 1305 }
1292 1306
1293 if (object *more = op->more) 1307 if (object *more = op->more)
1294 if (!insert_ob_in_map (more, m, originator, flag)) 1308 if (!insert_ob_in_map (more, m, originator, flag))
1295 return 0; 1309 return 0;
1296 1310
1297 CLEAR_FLAG (op, FLAG_REMOVED); 1311 op->flag [FLAG_REMOVED] = false;
1298 1312 op->env = 0;
1299 op->map = m; 1313 op->map = newmap;
1314
1300 mapspace &ms = op->ms (); 1315 mapspace &ms = op->ms ();
1301 1316
1302 /* this has to be done after we translate the coordinates. 1317 /* this has to be done after we translate the coordinates.
1303 */ 1318 */
1304 if (op->nrof && !(flag & INS_NO_MERGE)) 1319 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1325 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1340 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1326 abort (); 1341 abort ();
1327 } 1342 }
1328 1343
1329 if (!originator->is_on_map ()) 1344 if (!originator->is_on_map ())
1345 {
1330 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1346 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1331 op->debug_desc (), originator->debug_desc ()); 1347 op->debug_desc (), originator->debug_desc ());
1348 abort ();
1349 }
1332 1350
1333 op->above = originator; 1351 op->above = originator;
1334 op->below = originator->below; 1352 op->below = originator->below;
1335 originator->below = op; 1353 originator->below = op;
1336 1354
… …
1422 op->below = top; 1440 op->below = top;
1423 *(op->above ? &op->above->below : &ms.top) = op; 1441 *(op->above ? &op->above->below : &ms.top) = op;
1424 } 1442 }
1425 } 1443 }
1426 1444
1427 if (op->type == PLAYER) 1445 if (op->is_player ())
1428 { 1446 {
1429 op->contr->do_los = 1; 1447 op->contr->do_los = 1;
1430 ++op->map->players; 1448 ++op->map->players;
1431 op->map->touch (); 1449 op->map->touch ();
1432 } 1450 }
… …
1447 * be far away from this change and not affected in any way - 1465 * be far away from this change and not affected in any way -
1448 * this should get redone to only look for players within range, 1466 * this should get redone to only look for players within range,
1449 * or just updating the P_UPTODATE for spaces within this area 1467 * or just updating the P_UPTODATE for spaces within this area
1450 * of effect may be sufficient. 1468 * of effect may be sufficient.
1451 */ 1469 */
1452 if (op->affects_los () && op->map->darkness) 1470 if (op->affects_los ())
1453 { 1471 {
1454 op->ms ().invalidate (); 1472 op->ms ().invalidate ();
1455 update_all_los (op->map, op->x, op->y); 1473 update_all_los (op->map, op->x, op->y);
1456 } 1474 }
1457 1475
… …
1468 * blocked() and wall() work properly), and these flags are updated by 1486 * blocked() and wall() work properly), and these flags are updated by
1469 * update_object(). 1487 * update_object().
1470 */ 1488 */
1471 1489
1472 /* if this is not the head or flag has been passed, don't check walk on status */ 1490 /* if this is not the head or flag has been passed, don't check walk on status */
1473 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1491 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1474 { 1492 {
1475 if (check_move_on (op, originator)) 1493 if (check_move_on (op, originator))
1476 return 0; 1494 return 0;
1477 1495
1478 /* If we are a multi part object, lets work our way through the check 1496 /* If we are a multi part object, lets work our way through the check
… …
1489/* this function inserts an object in the map, but if it 1507/* this function inserts an object in the map, but if it
1490 * finds an object of its own type, it'll remove that one first. 1508 * finds an object of its own type, it'll remove that one first.
1491 * op is the object to insert it under: supplies x and the map. 1509 * op is the object to insert it under: supplies x and the map.
1492 */ 1510 */
1493void 1511void
1494replace_insert_ob_in_map (const char *arch_string, object *op) 1512replace_insert_ob_in_map (shstr_tmp archname, object *op)
1495{ 1513{
1496 /* first search for itself and remove any old instances */ 1514 /* first search for itself and remove any old instances */
1497 1515
1498 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1516 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1517 if (tmp->arch->archname == archname) /* same archetype */
1500 tmp->destroy (); 1518 tmp->destroy ();
1501 1519
1502 object *tmp = arch_to_object (archetype::find (arch_string)); 1520 object *tmp = arch_to_object (archetype::find (archname));
1503 1521
1504 tmp->x = op->x; 1522 tmp->x = op->x;
1505 tmp->y = op->y; 1523 tmp->y = op->y;
1506 1524
1507 insert_ob_in_map (tmp, op->map, op, 0); 1525 insert_ob_in_map (tmp, op->map, op, 0);
… …
1656 1674
1657 adjust_weight (this, op->total_weight ()); 1675 adjust_weight (this, op->total_weight ());
1658 1676
1659inserted: 1677inserted:
1660 /* reset the light list and los of the players on the map */ 1678 /* reset the light list and los of the players on the map */
1661 if (op->glow_radius && is_on_map () && map->darkness) 1679 if (op->glow_radius && is_on_map ())
1662 { 1680 {
1663 update_stats (); 1681 update_stats ();
1664 update_all_los (map, x, y); 1682 update_all_los (map, x, y);
1665 } 1683 }
1666 else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) 1684 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1667 // if this is a player's inventory, update stats 1685 // if this is a player's inventory, update stats
1668 update_stats (); 1686 update_stats ();
1669 1687
1670 INVOKE_OBJECT (INSERT, this); 1688 INVOKE_OBJECT (INSERT, this);
1671 1689
… …
1693 * on top. 1711 * on top.
1694 */ 1712 */
1695int 1713int
1696check_move_on (object *op, object *originator) 1714check_move_on (object *op, object *originator)
1697{ 1715{
1716 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1717 return 0;
1718
1698 object *tmp; 1719 object *tmp;
1699 maptile *m = op->map; 1720 maptile *m = op->map;
1700 int x = op->x, y = op->y; 1721 int x = op->x, y = op->y;
1701 1722
1702 MoveType move_on, move_slow, move_block; 1723 mapspace &ms = m->at (x, y);
1703 1724
1704 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1725 ms.update ();
1705 return 0;
1706 1726
1707 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1727 MoveType move_on = ms.move_on;
1708 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1728 MoveType move_slow = ms.move_slow;
1709 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1729 MoveType move_block = ms.move_block;
1710 1730
1711 /* if nothing on this space will slow op down or be applied, 1731 /* if nothing on this space will slow op down or be applied,
1712 * no need to do checking below. have to make sure move_type 1732 * no need to do checking below. have to make sure move_type
1713 * is set, as lots of objects don't have it set - we treat that 1733 * is set, as lots of objects don't have it set - we treat that
1714 * as walking. 1734 * as walking.
… …
1725 return 0; 1745 return 0;
1726 1746
1727 /* The objects have to be checked from top to bottom. 1747 /* The objects have to be checked from top to bottom.
1728 * Hence, we first go to the top: 1748 * Hence, we first go to the top:
1729 */ 1749 */
1730 1750 for (object *next, *tmp = ms.top; tmp; tmp = next)
1731 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1732 {
1733 /* Trim the search when we find the first other spell effect
1734 * this helps performance so that if a space has 50 spell objects,
1735 * we don't need to check all of them.
1736 */
1737 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1738 break;
1739 } 1751 {
1752 next = tmp->below;
1740 1753
1741 for (; tmp; tmp = tmp->below)
1742 {
1743 if (tmp == op) 1754 if (tmp == op)
1744 continue; /* Can't apply yourself */ 1755 continue; /* Can't apply yourself */
1745 1756
1746 /* Check to see if one of the movement types should be slowed down. 1757 /* Check to see if one of the movement types should be slowed down.
1747 * Second check makes sure that the movement types not being slowed 1758 * Second check makes sure that the movement types not being slowed
… …
1752 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1763 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1753 { 1764 {
1754 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1765 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1755 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1766 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1756 { 1767 {
1757
1758 float
1759 diff = tmp->move_slow_penalty * fabs (op->speed); 1768 float diff = tmp->move_slow_penalty * fabs (op->speed);
1760 1769
1761 if (op->type == PLAYER) 1770 if (op->is_player ())
1762 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1771 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1763 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1772 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1764 diff /= 4.0; 1773 diff /= 4.0;
1765 1774
1766 op->speed_left -= diff; 1775 op->speed_left -= diff;
1767 } 1776 }
1768 } 1777 }
… …
2052 * there is capable of. 2061 * there is capable of.
2053 */ 2062 */
2054int 2063int
2055find_dir (maptile *m, int x, int y, object *exclude) 2064find_dir (maptile *m, int x, int y, object *exclude)
2056{ 2065{
2057 int i, max = SIZEOFFREE, mflags; 2066 int max = SIZEOFFREE, mflags;
2058
2059 sint16 nx, ny;
2060 object *tmp;
2061 maptile *mp;
2062
2063 MoveType blocked, move_type; 2067 MoveType move_type;
2064 2068
2065 if (exclude && exclude->head_ () != exclude) 2069 if (exclude && exclude->head_ () != exclude)
2066 { 2070 {
2067 exclude = exclude->head; 2071 exclude = exclude->head;
2068 move_type = exclude->move_type; 2072 move_type = exclude->move_type;
… …
2071 { 2075 {
2072 /* If we don't have anything, presume it can use all movement types. */ 2076 /* If we don't have anything, presume it can use all movement types. */
2073 move_type = MOVE_ALL; 2077 move_type = MOVE_ALL;
2074 } 2078 }
2075 2079
2076 for (i = 1; i < max; i++) 2080 for (int i = 1; i < max; i++)
2077 { 2081 {
2078 mp = m; 2082 mapxy pos (m, x, y);
2079 nx = x + freearr_x[i]; 2083 pos.move (i);
2080 ny = y + freearr_y[i];
2081 2084
2082 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2085 if (!pos.normalise ())
2083
2084 if (mflags & P_OUT_OF_MAP)
2085 max = maxfree[i]; 2086 max = maxfree[i];
2086 else 2087 else
2087 { 2088 {
2088 mapspace &ms = mp->at (nx, ny); 2089 mapspace &ms = *pos;
2089 2090
2090 blocked = ms.move_block;
2091
2092 if ((move_type & blocked) == move_type) 2091 if ((move_type & ms.move_block) == move_type)
2093 max = maxfree[i]; 2092 max = maxfree [i];
2094 else if (mflags & P_IS_ALIVE) 2093 else if (ms.flags () & P_IS_ALIVE)
2095 { 2094 {
2096 for (tmp = ms.bot; tmp; tmp = tmp->above) 2095 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2097 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2096 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2098 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2097 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2099 break;
2100
2101 if (tmp)
2102 return freedir[i]; 2098 return freedir [i];
2103 } 2099 }
2104 } 2100 }
2105 } 2101 }
2106 2102
2107 return 0; 2103 return 0;
… …
2182 * This basically means that if direction is 15, then it could either go 2178 * This basically means that if direction is 15, then it could either go
2183 * direction 4, 14, or 16 to get back to where we are. 2179 * direction 4, 14, or 16 to get back to where we are.
2184 * Moved from spell_util.c to object.c with the other related direction 2180 * Moved from spell_util.c to object.c with the other related direction
2185 * functions. 2181 * functions.
2186 */ 2182 */
2187int reduction_dir[SIZEOFFREE][3] = { 2183const int reduction_dir[SIZEOFFREE][3] = {
2188 {0, 0, 0}, /* 0 */ 2184 {0, 0, 0}, /* 0 */
2189 {0, 0, 0}, /* 1 */ 2185 {0, 0, 0}, /* 1 */
2190 {0, 0, 0}, /* 2 */ 2186 {0, 0, 0}, /* 2 */
2191 {0, 0, 0}, /* 3 */ 2187 {0, 0, 0}, /* 3 */
2192 {0, 0, 0}, /* 4 */ 2188 {0, 0, 0}, /* 4 */
… …
2288int 2284int
2289can_pick (const object *who, const object *item) 2285can_pick (const object *who, const object *item)
2290{ 2286{
2291 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2287 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2292 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2288 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2293 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2289 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2294} 2290}
2295 2291
2296/* 2292/*
2297 * create clone from object to another 2293 * create clone from object to another
2298 */ 2294 */
… …
2330 return tmp; 2326 return tmp;
2331 2327
2332 return 0; 2328 return 0;
2333} 2329}
2334 2330
2335const shstr & 2331shstr_tmp
2336object::kv_get (const shstr &key) const 2332object::kv_get (shstr_tmp key) const
2337{ 2333{
2338 for (key_value *kv = key_values; kv; kv = kv->next) 2334 for (key_value *kv = key_values; kv; kv = kv->next)
2339 if (kv->key == key) 2335 if (kv->key == key)
2340 return kv->value; 2336 return kv->value;
2341 2337
2342 return shstr_null; 2338 return shstr ();
2343} 2339}
2344 2340
2345void 2341void
2346object::kv_set (const shstr &key, const shstr &value) 2342object::kv_set (shstr_tmp key, shstr_tmp value)
2347{ 2343{
2348 for (key_value *kv = key_values; kv; kv = kv->next) 2344 for (key_value *kv = key_values; kv; kv = kv->next)
2349 if (kv->key == key) 2345 if (kv->key == key)
2350 { 2346 {
2351 kv->value = value; 2347 kv->value = value;
… …
2360 2356
2361 key_values = kv; 2357 key_values = kv;
2362} 2358}
2363 2359
2364void 2360void
2365object::kv_del (const shstr &key) 2361object::kv_del (shstr_tmp key)
2366{ 2362{
2367 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2363 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2368 if ((*kvp)->key == key) 2364 if ((*kvp)->key == key)
2369 { 2365 {
2370 key_value *kv = *kvp; 2366 key_value *kv = *kvp;
… …
2501 container = 0; 2497 container = 0;
2502 2498
2503 // client needs item update to make it work, client bug requires this to be separate 2499 // client needs item update to make it work, client bug requires this to be separate
2504 esrv_update_item (UPD_FLAGS, this, old_container); 2500 esrv_update_item (UPD_FLAGS, this, old_container);
2505 2501
2506 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2502 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2507 play_sound (sound_find ("chest_close")); 2503 play_sound (sound_find ("chest_close"));
2508 } 2504 }
2509 2505
2510 if (new_container) 2506 if (new_container)
2511 { 2507 {
… …
2521 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2517 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2522 new_container->insert (closer); 2518 new_container->insert (closer);
2523 } 2519 }
2524#endif 2520#endif
2525 2521
2526 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2527 2523
2528 // make sure the container is available, client bug requires this to be separate 2524 // make sure the container is available, client bug requires this to be separate
2529 esrv_send_item (this, new_container); 2525 esrv_send_item (this, new_container);
2530 2526
2531 new_container->flag [FLAG_APPLIED] = true; 2527 new_container->flag [FLAG_APPLIED] = true;
… …
2539// else if (!old_container->env && contr && contr->ns) 2535// else if (!old_container->env && contr && contr->ns)
2540// contr->ns->floorbox_reset (); 2536// contr->ns->floorbox_reset ();
2541} 2537}
2542 2538
2543object * 2539object *
2544object::force_find (const shstr name) 2540object::force_find (shstr_tmp name)
2545{ 2541{
2546 /* cycle through his inventory to look for the MARK we want to 2542 /* cycle through his inventory to look for the MARK we want to
2547 * place 2543 * place
2548 */ 2544 */
2549 for (object *tmp = inv; tmp; tmp = tmp->below) 2545 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2552 2548
2553 return 0; 2549 return 0;
2554} 2550}
2555 2551
2556object * 2552object *
2557object::force_add (const shstr name, int duration) 2553object::force_add (shstr_tmp name, int duration)
2558{ 2554{
2559 if (object *force = force_find (name)) 2555 if (object *force = force_find (name))
2560 force->destroy (); 2556 force->destroy ();
2561 2557
2562 object *force = get_archetype (FORCE_NAME); 2558 object *force = get_archetype (FORCE_NAME);
… …
2571 2567
2572 return insert (force); 2568 return insert (force);
2573} 2569}
2574 2570
2575void 2571void
2576object::play_sound (faceidx sound) 2572object::play_sound (faceidx sound) const
2577{ 2573{
2578 if (!sound) 2574 if (!sound)
2579 return; 2575 return;
2580 2576
2581 if (flag [FLAG_REMOVED]) 2577 if (is_on_map ())
2582 return;
2583
2584 if (env)
2585 {
2586 if (object *pl = in_player ())
2587 pl->contr->play_sound (sound);
2588 }
2589 else
2590 map->play_sound (sound, x, y); 2578 map->play_sound (sound, x, y);
2579 else if (object *pl = in_player ())
2580 pl->contr->play_sound (sound);
2581}
2582
2583void
2584object::say_msg (const char *msg) const
2585{
2586 if (is_on_map ())
2587 map->say_msg (msg, x, y);
2588 else if (object *pl = in_player ())
2589 pl->contr->play_sound (sound);
2591} 2590}
2592 2591
2593void 2592void
2594object::make_noise () 2593object::make_noise ()
2595{ 2594{
… …
2604 2603
2605 // find old force, or create new one 2604 // find old force, or create new one
2606 object *force = force_find (shstr_noise_force); 2605 object *force = force_find (shstr_noise_force);
2607 2606
2608 if (force) 2607 if (force)
2609 force->speed = 1.f / 4; // patch old speed up 2608 force->speed_left = -1.f; // patch old speed up
2610 else 2609 else
2611 force_add (shstr_noise_force, 4); 2610 {
2612} 2611 force = archetype::get (shstr_noise_force);
2613 2612
2613 force->slaying = shstr_noise_force;
2614 force->stats.food = 1;
2615 force->speed_left = -1.f;
2616
2617 force->set_speed (1.f / 4.f);
2618 force->flag [FLAG_IS_USED_UP] = true;
2619 force->flag [FLAG_APPLIED] = true;
2620
2621 insert (force);
2622 }
2623}
2624

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines