| 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 |
| … | |
… | |
| 328 | // the player inventory itself is always visible |
328 | // the player inventory itself is always visible |
| 329 | if (env->is_player ()) |
329 | if (env->is_player ()) |
| 330 | return env; |
330 | return env; |
| 331 | |
331 | |
| 332 | // else a player could have our env open |
332 | // else a player could have our env open |
| 333 | object *envest = env->outer_env (); |
333 | object *envest = env->outer_env_or_self (); |
| 334 | |
334 | |
| 335 | // 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 |
| 336 | // even if our inv is in a player. |
336 | // even if our inv is in a player. |
| 337 | if (envest->is_on_map ()) |
337 | if (envest->is_on_map ()) |
| 338 | if (object *pl = envest->ms ().player ()) |
338 | if (object *pl = envest->ms ().player ()) |
| … | |
… | |
| 792 | |
792 | |
| 793 | object::object () |
793 | object::object () |
| 794 | { |
794 | { |
| 795 | SET_FLAG (this, FLAG_REMOVED); |
795 | SET_FLAG (this, FLAG_REMOVED); |
| 796 | |
796 | |
| 797 | expmul = 1.0; |
797 | //expmul = 1.0; declared const for the time being |
| 798 | face = blank_face; |
798 | face = blank_face; |
| 799 | } |
799 | } |
| 800 | |
800 | |
| 801 | object::~object () |
801 | object::~object () |
| 802 | { |
802 | { |
| … | |
… | |
| 831 | { |
831 | { |
| 832 | /* If already on active list, don't do anything */ |
832 | /* If already on active list, don't do anything */ |
| 833 | if (active) |
833 | if (active) |
| 834 | return; |
834 | return; |
| 835 | |
835 | |
| 836 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
| 837 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
| 838 | |
|
|
| 839 | if (has_active_speed ()) |
836 | if (has_active_speed ()) |
|
|
837 | { |
|
|
838 | if (flag [FLAG_FREED]) |
|
|
839 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
840 | |
| 840 | actives.insert (this); |
841 | actives.insert (this); |
|
|
842 | } |
| 841 | } |
843 | } |
| 842 | |
844 | |
| 843 | void |
845 | void |
| 844 | object::activate_recursive () |
846 | object::activate_recursive () |
| 845 | { |
847 | { |
| … | |
… | |
| 963 | |
965 | |
| 964 | void |
966 | void |
| 965 | object::do_destroy () |
967 | object::do_destroy () |
| 966 | { |
968 | { |
| 967 | if (flag [FLAG_IS_LINKED]) |
969 | if (flag [FLAG_IS_LINKED]) |
| 968 | remove_button_link (this); |
970 | remove_link (); |
| 969 | |
971 | |
| 970 | if (flag [FLAG_FRIENDLY]) |
972 | if (flag [FLAG_FRIENDLY]) |
| 971 | remove_friendly_object (this); |
973 | remove_friendly_object (this); |
| 972 | |
974 | |
| 973 | remove (); |
975 | remove (); |
| … | |
… | |
| 1097 | |
1099 | |
| 1098 | if (object *pl = ms.player ()) |
1100 | if (object *pl = ms.player ()) |
| 1099 | { |
1101 | { |
| 1100 | if (is_player ()) |
1102 | if (is_player ()) |
| 1101 | { |
1103 | { |
|
|
1104 | if (!flag [FLAG_WIZPASS]) |
| 1102 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
1105 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
| 1103 | |
1106 | |
| 1104 | // leaving a spot always closes any open container on the ground |
1107 | // leaving a spot always closes any open container on the ground |
| 1105 | if (container && !container->env) |
1108 | if (container && !container->env) |
| 1106 | // this causes spurious floorbox updates, but it ensures |
1109 | // this causes spurious floorbox updates, but it ensures |
| 1107 | // that the CLOSE event is being sent. |
1110 | // that the CLOSE event is being sent. |
| … | |
… | |
| 1285 | |
1288 | |
| 1286 | /* Ideally, the caller figures this out. However, it complicates a lot |
1289 | /* Ideally, the caller figures this out. However, it complicates a lot |
| 1287 | * of areas of callers (eg, anything that uses find_free_spot would now |
1290 | * of areas of callers (eg, anything that uses find_free_spot would now |
| 1288 | * need extra work |
1291 | * need extra work |
| 1289 | */ |
1292 | */ |
|
|
1293 | maptile *newmap = m; |
| 1290 | if (!xy_normalise (m, op->x, op->y)) |
1294 | if (!xy_normalise (newmap, op->x, op->y)) |
| 1291 | { |
1295 | { |
| 1292 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1296 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
| 1293 | return 0; |
1297 | return 0; |
| 1294 | } |
1298 | } |
| 1295 | |
1299 | |
| 1296 | if (object *more = op->more) |
1300 | if (object *more = op->more) |
| 1297 | if (!insert_ob_in_map (more, m, originator, flag)) |
1301 | if (!insert_ob_in_map (more, m, originator, flag)) |
| 1298 | return 0; |
1302 | return 0; |
| 1299 | |
1303 | |
| 1300 | CLEAR_FLAG (op, FLAG_REMOVED); |
1304 | op->flag [FLAG_REMOVED] = false; |
| 1301 | |
1305 | op->env = 0; |
| 1302 | op->map = m; |
1306 | op->map = newmap; |
|
|
1307 | |
| 1303 | mapspace &ms = op->ms (); |
1308 | mapspace &ms = op->ms (); |
| 1304 | |
1309 | |
| 1305 | /* this has to be done after we translate the coordinates. |
1310 | /* this has to be done after we translate the coordinates. |
| 1306 | */ |
1311 | */ |
| 1307 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1312 | if (op->nrof && !(flag & INS_NO_MERGE)) |
| … | |
… | |
| 1328 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1333 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
| 1329 | abort (); |
1334 | abort (); |
| 1330 | } |
1335 | } |
| 1331 | |
1336 | |
| 1332 | if (!originator->is_on_map ()) |
1337 | if (!originator->is_on_map ()) |
|
|
1338 | { |
| 1333 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1339 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
| 1334 | op->debug_desc (), originator->debug_desc ()); |
1340 | op->debug_desc (), originator->debug_desc ()); |
|
|
1341 | abort (); |
|
|
1342 | } |
| 1335 | |
1343 | |
| 1336 | op->above = originator; |
1344 | op->above = originator; |
| 1337 | op->below = originator->below; |
1345 | op->below = originator->below; |
| 1338 | originator->below = op; |
1346 | originator->below = op; |
| 1339 | |
1347 | |
| … | |
… | |
| 1471 | * blocked() and wall() work properly), and these flags are updated by |
1479 | * blocked() and wall() work properly), and these flags are updated by |
| 1472 | * update_object(). |
1480 | * update_object(). |
| 1473 | */ |
1481 | */ |
| 1474 | |
1482 | |
| 1475 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1483 | /* if this is not the head or flag has been passed, don't check walk on status */ |
| 1476 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1484 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
| 1477 | { |
1485 | { |
| 1478 | if (check_move_on (op, originator)) |
1486 | if (check_move_on (op, originator)) |
| 1479 | return 0; |
1487 | return 0; |
| 1480 | |
1488 | |
| 1481 | /* If we are a multi part object, lets work our way through the check |
1489 | /* If we are a multi part object, lets work our way through the check |
| … | |
… | |
| 1492 | /* this function inserts an object in the map, but if it |
1500 | /* this function inserts an object in the map, but if it |
| 1493 | * finds an object of its own type, it'll remove that one first. |
1501 | * finds an object of its own type, it'll remove that one first. |
| 1494 | * op is the object to insert it under: supplies x and the map. |
1502 | * op is the object to insert it under: supplies x and the map. |
| 1495 | */ |
1503 | */ |
| 1496 | void |
1504 | void |
| 1497 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1505 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
| 1498 | { |
1506 | { |
| 1499 | /* first search for itself and remove any old instances */ |
1507 | /* first search for itself and remove any old instances */ |
| 1500 | |
1508 | |
| 1501 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1509 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
| 1502 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1510 | if (tmp->arch->archname == archname) /* same archetype */ |
| 1503 | tmp->destroy (); |
1511 | tmp->destroy (); |
| 1504 | |
1512 | |
| 1505 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1513 | object *tmp = arch_to_object (archetype::find (archname)); |
| 1506 | |
1514 | |
| 1507 | tmp->x = op->x; |
1515 | tmp->x = op->x; |
| 1508 | tmp->y = op->y; |
1516 | tmp->y = op->y; |
| 1509 | |
1517 | |
| 1510 | insert_ob_in_map (tmp, op->map, op, 0); |
1518 | insert_ob_in_map (tmp, op->map, op, 0); |
| … | |
… | |
| 1696 | * on top. |
1704 | * on top. |
| 1697 | */ |
1705 | */ |
| 1698 | int |
1706 | int |
| 1699 | check_move_on (object *op, object *originator) |
1707 | check_move_on (object *op, object *originator) |
| 1700 | { |
1708 | { |
|
|
1709 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1710 | return 0; |
|
|
1711 | |
| 1701 | object *tmp; |
1712 | object *tmp; |
| 1702 | maptile *m = op->map; |
1713 | maptile *m = op->map; |
| 1703 | int x = op->x, y = op->y; |
1714 | int x = op->x, y = op->y; |
| 1704 | |
1715 | |
| 1705 | MoveType move_on, move_slow, move_block; |
1716 | mapspace &ms = m->at (x, y); |
| 1706 | |
1717 | |
| 1707 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1718 | ms.update (); |
| 1708 | return 0; |
|
|
| 1709 | |
1719 | |
| 1710 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1720 | MoveType move_on = ms.move_on; |
| 1711 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1721 | MoveType move_slow = ms.move_slow; |
| 1712 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1722 | MoveType move_block = ms.move_block; |
| 1713 | |
1723 | |
| 1714 | /* if nothing on this space will slow op down or be applied, |
1724 | /* if nothing on this space will slow op down or be applied, |
| 1715 | * no need to do checking below. have to make sure move_type |
1725 | * no need to do checking below. have to make sure move_type |
| 1716 | * is set, as lots of objects don't have it set - we treat that |
1726 | * is set, as lots of objects don't have it set - we treat that |
| 1717 | * as walking. |
1727 | * as walking. |
| … | |
… | |
| 1728 | return 0; |
1738 | return 0; |
| 1729 | |
1739 | |
| 1730 | /* The objects have to be checked from top to bottom. |
1740 | /* The objects have to be checked from top to bottom. |
| 1731 | * Hence, we first go to the top: |
1741 | * Hence, we first go to the top: |
| 1732 | */ |
1742 | */ |
| 1733 | |
1743 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
| 1734 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
| 1735 | { |
|
|
| 1736 | /* Trim the search when we find the first other spell effect |
|
|
| 1737 | * this helps performance so that if a space has 50 spell objects, |
|
|
| 1738 | * we don't need to check all of them. |
|
|
| 1739 | */ |
|
|
| 1740 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
| 1741 | break; |
|
|
| 1742 | } |
1744 | { |
|
|
1745 | next = tmp->below; |
| 1743 | |
1746 | |
| 1744 | for (; tmp; tmp = tmp->below) |
|
|
| 1745 | { |
|
|
| 1746 | if (tmp == op) |
1747 | if (tmp == op) |
| 1747 | continue; /* Can't apply yourself */ |
1748 | continue; /* Can't apply yourself */ |
| 1748 | |
1749 | |
| 1749 | /* Check to see if one of the movement types should be slowed down. |
1750 | /* Check to see if one of the movement types should be slowed down. |
| 1750 | * Second check makes sure that the movement types not being slowed |
1751 | * Second check makes sure that the movement types not being slowed |
| … | |
… | |
| 1755 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1756 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
| 1756 | { |
1757 | { |
| 1757 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1758 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
| 1758 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1759 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
| 1759 | { |
1760 | { |
| 1760 | |
|
|
| 1761 | float |
|
|
| 1762 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1761 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
| 1763 | |
1762 | |
| 1764 | if (op->is_player ()) |
1763 | if (op->is_player ()) |
| 1765 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1764 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
| 1766 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1765 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
| 1767 | diff /= 4.0; |
1766 | diff /= 4.0; |
| 1768 | |
1767 | |
| 1769 | op->speed_left -= diff; |
1768 | op->speed_left -= diff; |
| 1770 | } |
1769 | } |
| 1771 | } |
1770 | } |
| … | |
… | |
| 2055 | * there is capable of. |
2054 | * there is capable of. |
| 2056 | */ |
2055 | */ |
| 2057 | int |
2056 | int |
| 2058 | find_dir (maptile *m, int x, int y, object *exclude) |
2057 | find_dir (maptile *m, int x, int y, object *exclude) |
| 2059 | { |
2058 | { |
| 2060 | int i, max = SIZEOFFREE, mflags; |
2059 | int max = SIZEOFFREE, mflags; |
| 2061 | |
|
|
| 2062 | sint16 nx, ny; |
|
|
| 2063 | object *tmp; |
|
|
| 2064 | maptile *mp; |
|
|
| 2065 | |
|
|
| 2066 | MoveType blocked, move_type; |
2060 | MoveType move_type; |
| 2067 | |
2061 | |
| 2068 | if (exclude && exclude->head_ () != exclude) |
2062 | if (exclude && exclude->head_ () != exclude) |
| 2069 | { |
2063 | { |
| 2070 | exclude = exclude->head; |
2064 | exclude = exclude->head; |
| 2071 | move_type = exclude->move_type; |
2065 | move_type = exclude->move_type; |
| … | |
… | |
| 2074 | { |
2068 | { |
| 2075 | /* If we don't have anything, presume it can use all movement types. */ |
2069 | /* If we don't have anything, presume it can use all movement types. */ |
| 2076 | move_type = MOVE_ALL; |
2070 | move_type = MOVE_ALL; |
| 2077 | } |
2071 | } |
| 2078 | |
2072 | |
| 2079 | for (i = 1; i < max; i++) |
2073 | for (int i = 1; i < max; i++) |
| 2080 | { |
2074 | { |
| 2081 | mp = m; |
2075 | mapxy pos (m, x, y); |
| 2082 | nx = x + freearr_x[i]; |
2076 | pos.move (i); |
| 2083 | ny = y + freearr_y[i]; |
|
|
| 2084 | |
2077 | |
| 2085 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2078 | if (!pos.normalise ()) |
| 2086 | |
|
|
| 2087 | if (mflags & P_OUT_OF_MAP) |
|
|
| 2088 | max = maxfree[i]; |
2079 | max = maxfree[i]; |
| 2089 | else |
2080 | else |
| 2090 | { |
2081 | { |
| 2091 | mapspace &ms = mp->at (nx, ny); |
2082 | mapspace &ms = *pos; |
| 2092 | |
2083 | |
| 2093 | blocked = ms.move_block; |
|
|
| 2094 | |
|
|
| 2095 | if ((move_type & blocked) == move_type) |
2084 | if ((move_type & ms.move_block) == move_type) |
| 2096 | max = maxfree[i]; |
2085 | max = maxfree [i]; |
| 2097 | else if (mflags & P_IS_ALIVE) |
2086 | else if (ms.flags () & P_IS_ALIVE) |
| 2098 | { |
2087 | { |
| 2099 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2088 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
| 2100 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2089 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
| 2101 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2090 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
| 2102 | break; |
|
|
| 2103 | |
|
|
| 2104 | if (tmp) |
|
|
| 2105 | return freedir[i]; |
2091 | return freedir [i]; |
| 2106 | } |
2092 | } |
| 2107 | } |
2093 | } |
| 2108 | } |
2094 | } |
| 2109 | |
2095 | |
| 2110 | return 0; |
2096 | return 0; |
| … | |
… | |
| 2185 | * This basically means that if direction is 15, then it could either go |
2171 | * This basically means that if direction is 15, then it could either go |
| 2186 | * direction 4, 14, or 16 to get back to where we are. |
2172 | * direction 4, 14, or 16 to get back to where we are. |
| 2187 | * Moved from spell_util.c to object.c with the other related direction |
2173 | * Moved from spell_util.c to object.c with the other related direction |
| 2188 | * functions. |
2174 | * functions. |
| 2189 | */ |
2175 | */ |
| 2190 | int reduction_dir[SIZEOFFREE][3] = { |
2176 | const int reduction_dir[SIZEOFFREE][3] = { |
| 2191 | {0, 0, 0}, /* 0 */ |
2177 | {0, 0, 0}, /* 0 */ |
| 2192 | {0, 0, 0}, /* 1 */ |
2178 | {0, 0, 0}, /* 1 */ |
| 2193 | {0, 0, 0}, /* 2 */ |
2179 | {0, 0, 0}, /* 2 */ |
| 2194 | {0, 0, 0}, /* 3 */ |
2180 | {0, 0, 0}, /* 3 */ |
| 2195 | {0, 0, 0}, /* 4 */ |
2181 | {0, 0, 0}, /* 4 */ |
| … | |
… | |
| 2333 | return tmp; |
2319 | return tmp; |
| 2334 | |
2320 | |
| 2335 | return 0; |
2321 | return 0; |
| 2336 | } |
2322 | } |
| 2337 | |
2323 | |
| 2338 | const shstr & |
2324 | shstr_tmp |
| 2339 | object::kv_get (const shstr &key) const |
2325 | object::kv_get (shstr_tmp key) const |
| 2340 | { |
2326 | { |
| 2341 | for (key_value *kv = key_values; kv; kv = kv->next) |
2327 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2342 | if (kv->key == key) |
2328 | if (kv->key == key) |
| 2343 | return kv->value; |
2329 | return kv->value; |
| 2344 | |
2330 | |
| 2345 | return shstr_null; |
2331 | return shstr (); |
| 2346 | } |
2332 | } |
| 2347 | |
2333 | |
| 2348 | void |
2334 | void |
| 2349 | object::kv_set (const shstr &key, const shstr &value) |
2335 | object::kv_set (shstr_tmp key, shstr_tmp value) |
| 2350 | { |
2336 | { |
| 2351 | for (key_value *kv = key_values; kv; kv = kv->next) |
2337 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2352 | if (kv->key == key) |
2338 | if (kv->key == key) |
| 2353 | { |
2339 | { |
| 2354 | kv->value = value; |
2340 | kv->value = value; |
| … | |
… | |
| 2363 | |
2349 | |
| 2364 | key_values = kv; |
2350 | key_values = kv; |
| 2365 | } |
2351 | } |
| 2366 | |
2352 | |
| 2367 | void |
2353 | void |
| 2368 | object::kv_del (const shstr &key) |
2354 | object::kv_del (shstr_tmp key) |
| 2369 | { |
2355 | { |
| 2370 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2356 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
| 2371 | if ((*kvp)->key == key) |
2357 | if ((*kvp)->key == key) |
| 2372 | { |
2358 | { |
| 2373 | key_value *kv = *kvp; |
2359 | key_value *kv = *kvp; |
| … | |
… | |
| 2504 | container = 0; |
2490 | container = 0; |
| 2505 | |
2491 | |
| 2506 | // client needs item update to make it work, client bug requires this to be separate |
2492 | // client needs item update to make it work, client bug requires this to be separate |
| 2507 | esrv_update_item (UPD_FLAGS, this, old_container); |
2493 | esrv_update_item (UPD_FLAGS, this, old_container); |
| 2508 | |
2494 | |
| 2509 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2495 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
| 2510 | play_sound (sound_find ("chest_close")); |
2496 | play_sound (sound_find ("chest_close")); |
| 2511 | } |
2497 | } |
| 2512 | |
2498 | |
| 2513 | if (new_container) |
2499 | if (new_container) |
| 2514 | { |
2500 | { |
| … | |
… | |
| 2524 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2510 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
| 2525 | new_container->insert (closer); |
2511 | new_container->insert (closer); |
| 2526 | } |
2512 | } |
| 2527 | #endif |
2513 | #endif |
| 2528 | |
2514 | |
| 2529 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2515 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
| 2530 | |
2516 | |
| 2531 | // make sure the container is available, client bug requires this to be separate |
2517 | // make sure the container is available, client bug requires this to be separate |
| 2532 | esrv_send_item (this, new_container); |
2518 | esrv_send_item (this, new_container); |
| 2533 | |
2519 | |
| 2534 | new_container->flag [FLAG_APPLIED] = true; |
2520 | new_container->flag [FLAG_APPLIED] = true; |
| … | |
… | |
| 2542 | // else if (!old_container->env && contr && contr->ns) |
2528 | // else if (!old_container->env && contr && contr->ns) |
| 2543 | // contr->ns->floorbox_reset (); |
2529 | // contr->ns->floorbox_reset (); |
| 2544 | } |
2530 | } |
| 2545 | |
2531 | |
| 2546 | object * |
2532 | object * |
| 2547 | object::force_find (const shstr name) |
2533 | object::force_find (shstr_tmp name) |
| 2548 | { |
2534 | { |
| 2549 | /* cycle through his inventory to look for the MARK we want to |
2535 | /* cycle through his inventory to look for the MARK we want to |
| 2550 | * place |
2536 | * place |
| 2551 | */ |
2537 | */ |
| 2552 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2538 | for (object *tmp = inv; tmp; tmp = tmp->below) |
| … | |
… | |
| 2555 | |
2541 | |
| 2556 | return 0; |
2542 | return 0; |
| 2557 | } |
2543 | } |
| 2558 | |
2544 | |
| 2559 | object * |
2545 | object * |
| 2560 | object::force_add (const shstr name, int duration) |
2546 | object::force_add (shstr_tmp name, int duration) |
| 2561 | { |
2547 | { |
| 2562 | if (object *force = force_find (name)) |
2548 | if (object *force = force_find (name)) |
| 2563 | force->destroy (); |
2549 | force->destroy (); |
| 2564 | |
2550 | |
| 2565 | object *force = get_archetype (FORCE_NAME); |
2551 | object *force = get_archetype (FORCE_NAME); |
| … | |
… | |
| 2574 | |
2560 | |
| 2575 | return insert (force); |
2561 | return insert (force); |
| 2576 | } |
2562 | } |
| 2577 | |
2563 | |
| 2578 | void |
2564 | void |
| 2579 | object::play_sound (faceidx sound) |
2565 | object::play_sound (faceidx sound) const |
| 2580 | { |
2566 | { |
| 2581 | if (!sound) |
2567 | if (!sound) |
| 2582 | return; |
2568 | return; |
| 2583 | |
2569 | |
| 2584 | if (flag [FLAG_REMOVED]) |
2570 | if (is_on_map ()) |
| 2585 | return; |
|
|
| 2586 | |
|
|
| 2587 | if (env) |
|
|
| 2588 | { |
|
|
| 2589 | if (object *pl = in_player ()) |
|
|
| 2590 | pl->contr->play_sound (sound); |
|
|
| 2591 | } |
|
|
| 2592 | else |
|
|
| 2593 | map->play_sound (sound, x, y); |
2571 | map->play_sound (sound, x, y); |
|
|
2572 | else if (object *pl = in_player ()) |
|
|
2573 | pl->contr->play_sound (sound); |
|
|
2574 | } |
|
|
2575 | |
|
|
2576 | void |
|
|
2577 | object::say_msg (const char *msg) const |
|
|
2578 | { |
|
|
2579 | if (is_on_map ()) |
|
|
2580 | map->say_msg (msg, x, y); |
|
|
2581 | else if (object *pl = in_player ()) |
|
|
2582 | pl->contr->play_sound (sound); |
| 2594 | } |
2583 | } |
| 2595 | |
2584 | |
| 2596 | void |
2585 | void |
| 2597 | object::make_noise () |
2586 | object::make_noise () |
| 2598 | { |
2587 | { |
