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.263 by root, Sat Dec 20 16:29:41 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 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 ())
… …
758 else if (action == UP_OBJ_INSERT) 759 else if (action == UP_OBJ_INSERT)
759 { 760 {
760 // this is likely overkill, TODO: revisit (schmorp) 761 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 764 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 766 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 767 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 768 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 769 || (m.move_off | op->move_off ) != m.move_off
… …
770 /* This isn't perfect, but I don't expect a lot of objects to 771 /* This isn't perfect, but I don't expect a lot of objects to
771 * have move_allow right now. 772 * have move_allow right now.
772 */ 773 */
773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775 m.flags_ = 0; 776 m.invalidate ();
776 } 777 }
777 /* if the object is being removed, we can't make intelligent 778 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 779 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 780 * that is being removed.
780 */ 781 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 782 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 783 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 784 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 785 /* Nothing to do for that case */ ;
785 else 786 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 787 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 788
… …
791 792
792object::object () 793object::object ()
793{ 794{
794 SET_FLAG (this, FLAG_REMOVED); 795 SET_FLAG (this, FLAG_REMOVED);
795 796
796 expmul = 1.0; 797 //expmul = 1.0; declared const for the time being
797 face = blank_face; 798 face = blank_face;
798} 799}
799 800
800object::~object () 801object::~object ()
801{ 802{
… …
830{ 831{
831 /* If already on active list, don't do anything */ 832 /* If already on active list, don't do anything */
832 if (active) 833 if (active)
833 return; 834 return;
834 835
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 ()) 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
839 actives.insert (this); 841 actives.insert (this);
842 }
840} 843}
841 844
842void 845void
843object::activate_recursive () 846object::activate_recursive ()
844{ 847{
… …
962 965
963void 966void
964object::do_destroy () 967object::do_destroy ()
965{ 968{
966 if (flag [FLAG_IS_LINKED]) 969 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 970 remove_link ();
968 971
969 if (flag [FLAG_FRIENDLY]) 972 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 973 remove_friendly_object (this);
971 974
972 remove (); 975 remove ();
… …
1055 if (object *pl = visible_to ()) 1058 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count); 1059 esrv_del_item (pl->contr, count);
1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1060 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058 1061
1059 adjust_weight (env, -total_weight ()); 1062 adjust_weight (env, -total_weight ());
1063
1064 object *pl = in_player ();
1060 1065
1061 /* we set up values so that it could be inserted into 1066 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1067 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1068 * to the caller to decide what we want to do.
1064 */ 1069 */
… …
1076 1081
1077 /* NO_FIX_PLAYER is set when a great many changes are being 1082 /* NO_FIX_PLAYER is set when a great many changes are being
1078 * made to players inventory. If set, avoiding the call 1083 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 1084 * to save cpu time.
1080 */ 1085 */
1081 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1086 if (pl)
1087 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1088 {
1082 otmp->update_stats (); 1089 pl->update_stats ();
1090
1091 if (glow_radius && pl->is_on_map ())
1092 update_all_los (pl->map, pl->x, pl->y);
1093 }
1083 } 1094 }
1084 else if (map) 1095 else if (map)
1085 { 1096 {
1086 map->dirty = true; 1097 map->dirty = true;
1087 mapspace &ms = this->ms (); 1098 mapspace &ms = this->ms ();
1088 1099
1089 if (object *pl = ms.player ()) 1100 if (object *pl = ms.player ())
1090 { 1101 {
1091 if (type == PLAYER) // this == pl(!) 1102 if (is_player ())
1092 { 1103 {
1104 if (!flag [FLAG_WIZPASS])
1105 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1106
1093 // leaving a spot always closes any open container on the ground 1107 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1108 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1109 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1110 // that the CLOSE event is being sent.
1097 close_container (); 1111 close_container ();
… …
1114 *(below ? &below->above : &ms.bot) = above; 1128 *(below ? &below->above : &ms.bot) = above;
1115 1129
1116 above = 0; 1130 above = 0;
1117 below = 0; 1131 below = 0;
1118 1132
1119 ms.flags_ = 0; 1133 ms.invalidate ();
1120 1134
1121 if (map->in_memory == MAP_SAVING) 1135 if (map->in_memory == MAP_SAVING)
1122 return; 1136 return;
1123 1137
1124 int check_walk_off = !flag [FLAG_NO_APPLY]; 1138 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1157 } 1171 }
1158 1172
1159 last = tmp; 1173 last = tmp;
1160 } 1174 }
1161 1175
1162 if (glow_radius || flag [FLAG_BLOCKSVIEW]) 1176 if (affects_los ())
1163 update_all_los (map, x, y); 1177 update_all_los (map, x, y);
1164 } 1178 }
1165} 1179}
1166 1180
1167/* 1181/*
… …
1274 1288
1275 /* Ideally, the caller figures this out. However, it complicates a lot 1289 /* Ideally, the caller figures this out. However, it complicates a lot
1276 * 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
1277 * need extra work 1291 * need extra work
1278 */ 1292 */
1293 maptile *newmap = m;
1279 if (!xy_normalise (m, op->x, op->y)) 1294 if (!xy_normalise (newmap, op->x, op->y))
1280 { 1295 {
1281 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1296 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282 return 0; 1297 return 0;
1283 } 1298 }
1284 1299
1285 if (object *more = op->more) 1300 if (object *more = op->more)
1286 if (!insert_ob_in_map (more, m, originator, flag)) 1301 if (!insert_ob_in_map (more, m, originator, flag))
1287 return 0; 1302 return 0;
1288 1303
1289 CLEAR_FLAG (op, FLAG_REMOVED); 1304 op->flag [FLAG_REMOVED] = false;
1290 1305 op->env = 0;
1291 op->map = m; 1306 op->map = newmap;
1307
1292 mapspace &ms = op->ms (); 1308 mapspace &ms = op->ms ();
1293 1309
1294 /* this has to be done after we translate the coordinates. 1310 /* this has to be done after we translate the coordinates.
1295 */ 1311 */
1296 if (op->nrof && !(flag & INS_NO_MERGE)) 1312 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1317 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");
1318 abort (); 1334 abort ();
1319 } 1335 }
1320 1336
1321 if (!originator->is_on_map ()) 1337 if (!originator->is_on_map ())
1338 {
1322 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",
1323 op->debug_desc (), originator->debug_desc ()); 1340 op->debug_desc (), originator->debug_desc ());
1341 abort ();
1342 }
1324 1343
1325 op->above = originator; 1344 op->above = originator;
1326 op->below = originator->below; 1345 op->below = originator->below;
1327 originator->below = op; 1346 originator->below = op;
1328 1347
… …
1414 op->below = top; 1433 op->below = top;
1415 *(op->above ? &op->above->below : &ms.top) = op; 1434 *(op->above ? &op->above->below : &ms.top) = op;
1416 } 1435 }
1417 } 1436 }
1418 1437
1419 if (op->type == PLAYER) 1438 if (op->is_player ())
1420 { 1439 {
1421 op->contr->do_los = 1; 1440 op->contr->do_los = 1;
1422 ++op->map->players; 1441 ++op->map->players;
1423 op->map->touch (); 1442 op->map->touch ();
1424 } 1443 }
… …
1439 * be far away from this change and not affected in any way - 1458 * be far away from this change and not affected in any way -
1440 * this should get redone to only look for players within range, 1459 * this should get redone to only look for players within range,
1441 * or just updating the P_UPTODATE for spaces within this area 1460 * or just updating the P_UPTODATE for spaces within this area
1442 * of effect may be sufficient. 1461 * of effect may be sufficient.
1443 */ 1462 */
1444 if (op->map->darkness && (op->glow_radius || op->flag [FLAG_BLOCKSVIEW])) 1463 if (op->affects_los ())
1464 {
1465 op->ms ().invalidate ();
1445 update_all_los (op->map, op->x, op->y); 1466 update_all_los (op->map, op->x, op->y);
1467 }
1446 1468
1447 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1469 /* updates flags (blocked, alive, no magic, etc) for this map space */
1448 update_object (op, UP_OBJ_INSERT); 1470 update_object (op, UP_OBJ_INSERT);
1449 1471
1450 INVOKE_OBJECT (INSERT, op); 1472 INVOKE_OBJECT (INSERT, op);
… …
1478/* this function inserts an object in the map, but if it 1500/* this function inserts an object in the map, but if it
1479 * 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.
1480 * 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.
1481 */ 1503 */
1482void 1504void
1483replace_insert_ob_in_map (const char *arch_string, object *op) 1505replace_insert_ob_in_map (shstr_tmp archname, object *op)
1484{ 1506{
1485 /* first search for itself and remove any old instances */ 1507 /* first search for itself and remove any old instances */
1486 1508
1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1509 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1510 if (tmp->arch->archname == archname) /* same archetype */
1489 tmp->destroy (); 1511 tmp->destroy ();
1490 1512
1491 object *tmp = arch_to_object (archetype::find (arch_string)); 1513 object *tmp = arch_to_object (archetype::find (archname));
1492 1514
1493 tmp->x = op->x; 1515 tmp->x = op->x;
1494 tmp->y = op->y; 1516 tmp->y = op->y;
1495 1517
1496 insert_ob_in_map (tmp, op->map, op, 0); 1518 insert_ob_in_map (tmp, op->map, op, 0);
… …
1645 1667
1646 adjust_weight (this, op->total_weight ()); 1668 adjust_weight (this, op->total_weight ());
1647 1669
1648inserted: 1670inserted:
1649 /* reset the light list and los of the players on the map */ 1671 /* reset the light list and los of the players on the map */
1650 if (op->glow_radius && map && map->darkness) 1672 if (op->glow_radius && is_on_map ())
1673 {
1674 update_stats ();
1651 update_all_los (map, x, y); 1675 update_all_los (map, x, y);
1652 1676 }
1677 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1653 // if this is a player's inventory, update stats 1678 // if this is a player's inventory, update stats
1654 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1655 update_stats (); 1679 update_stats ();
1656 1680
1657 INVOKE_OBJECT (INSERT, this); 1681 INVOKE_OBJECT (INSERT, this);
1658 1682
1659 return op; 1683 return op;
… …
1743 { 1767 {
1744 1768
1745 float 1769 float
1746 diff = tmp->move_slow_penalty * fabs (op->speed); 1770 diff = tmp->move_slow_penalty * fabs (op->speed);
1747 1771
1748 if (op->type == PLAYER) 1772 if (op->is_player ())
1749 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1773 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1750 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1774 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1751 diff /= 4.0; 1775 diff /= 4.0;
1752 1776
1753 op->speed_left -= diff; 1777 op->speed_left -= diff;
… …
2039 * there is capable of. 2063 * there is capable of.
2040 */ 2064 */
2041int 2065int
2042find_dir (maptile *m, int x, int y, object *exclude) 2066find_dir (maptile *m, int x, int y, object *exclude)
2043{ 2067{
2044 int i, max = SIZEOFFREE, mflags; 2068 int max = SIZEOFFREE, mflags;
2045
2046 sint16 nx, ny;
2047 object *tmp;
2048 maptile *mp;
2049
2050 MoveType blocked, move_type; 2069 MoveType move_type;
2051 2070
2052 if (exclude && exclude->head_ () != exclude) 2071 if (exclude && exclude->head_ () != exclude)
2053 { 2072 {
2054 exclude = exclude->head; 2073 exclude = exclude->head;
2055 move_type = exclude->move_type; 2074 move_type = exclude->move_type;
… …
2058 { 2077 {
2059 /* If we don't have anything, presume it can use all movement types. */ 2078 /* If we don't have anything, presume it can use all movement types. */
2060 move_type = MOVE_ALL; 2079 move_type = MOVE_ALL;
2061 } 2080 }
2062 2081
2063 for (i = 1; i < max; i++) 2082 for (int i = 1; i < max; i++)
2064 { 2083 {
2065 mp = m; 2084 mapxy pos (m, x, y);
2066 nx = x + freearr_x[i]; 2085 pos.move (i);
2067 ny = y + freearr_y[i];
2068 2086
2069 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2087 if (!pos.normalise ())
2070
2071 if (mflags & P_OUT_OF_MAP)
2072 max = maxfree[i]; 2088 max = maxfree[i];
2073 else 2089 else
2074 { 2090 {
2075 mapspace &ms = mp->at (nx, ny); 2091 mapspace &ms = *pos;
2076 2092
2077 blocked = ms.move_block;
2078
2079 if ((move_type & blocked) == move_type) 2093 if ((move_type & ms.move_block) == move_type)
2080 max = maxfree[i]; 2094 max = maxfree [i];
2081 else if (mflags & P_IS_ALIVE) 2095 else if (ms.flags () & P_IS_ALIVE)
2082 { 2096 {
2083 for (tmp = ms.bot; tmp; tmp = tmp->above) 2097 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2084 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2098 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2085 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2099 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2086 break;
2087
2088 if (tmp)
2089 return freedir[i]; 2100 return freedir [i];
2090 } 2101 }
2091 } 2102 }
2092 } 2103 }
2093 2104
2094 return 0; 2105 return 0;
… …
2169 * This basically means that if direction is 15, then it could either go 2180 * This basically means that if direction is 15, then it could either go
2170 * direction 4, 14, or 16 to get back to where we are. 2181 * direction 4, 14, or 16 to get back to where we are.
2171 * Moved from spell_util.c to object.c with the other related direction 2182 * Moved from spell_util.c to object.c with the other related direction
2172 * functions. 2183 * functions.
2173 */ 2184 */
2174int reduction_dir[SIZEOFFREE][3] = { 2185const int reduction_dir[SIZEOFFREE][3] = {
2175 {0, 0, 0}, /* 0 */ 2186 {0, 0, 0}, /* 0 */
2176 {0, 0, 0}, /* 1 */ 2187 {0, 0, 0}, /* 1 */
2177 {0, 0, 0}, /* 2 */ 2188 {0, 0, 0}, /* 2 */
2178 {0, 0, 0}, /* 3 */ 2189 {0, 0, 0}, /* 3 */
2179 {0, 0, 0}, /* 4 */ 2190 {0, 0, 0}, /* 4 */
… …
2275int 2286int
2276can_pick (const object *who, const object *item) 2287can_pick (const object *who, const object *item)
2277{ 2288{
2278 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2289 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2279 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2290 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2280 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2291 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2281} 2292}
2282 2293
2283/* 2294/*
2284 * create clone from object to another 2295 * create clone from object to another
2285 */ 2296 */
… …
2317 return tmp; 2328 return tmp;
2318 2329
2319 return 0; 2330 return 0;
2320} 2331}
2321 2332
2322const shstr & 2333shstr_tmp
2323object::kv_get (const shstr &key) const 2334object::kv_get (shstr_tmp key) const
2324{ 2335{
2325 for (key_value *kv = key_values; kv; kv = kv->next) 2336 for (key_value *kv = key_values; kv; kv = kv->next)
2326 if (kv->key == key) 2337 if (kv->key == key)
2327 return kv->value; 2338 return kv->value;
2328 2339
2329 return shstr_null; 2340 return shstr ();
2330} 2341}
2331 2342
2332void 2343void
2333object::kv_set (const shstr &key, const shstr &value) 2344object::kv_set (shstr_tmp key, shstr_tmp value)
2334{ 2345{
2335 for (key_value *kv = key_values; kv; kv = kv->next) 2346 for (key_value *kv = key_values; kv; kv = kv->next)
2336 if (kv->key == key) 2347 if (kv->key == key)
2337 { 2348 {
2338 kv->value = value; 2349 kv->value = value;
… …
2347 2358
2348 key_values = kv; 2359 key_values = kv;
2349} 2360}
2350 2361
2351void 2362void
2352object::kv_del (const shstr &key) 2363object::kv_del (shstr_tmp key)
2353{ 2364{
2354 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2365 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2355 if ((*kvp)->key == key) 2366 if ((*kvp)->key == key)
2356 { 2367 {
2357 key_value *kv = *kvp; 2368 key_value *kv = *kvp;
… …
2488 container = 0; 2499 container = 0;
2489 2500
2490 // client needs item update to make it work, client bug requires this to be separate 2501 // client needs item update to make it work, client bug requires this to be separate
2491 esrv_update_item (UPD_FLAGS, this, old_container); 2502 esrv_update_item (UPD_FLAGS, this, old_container);
2492 2503
2493 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2504 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2494 play_sound (sound_find ("chest_close")); 2505 play_sound (sound_find ("chest_close"));
2495 } 2506 }
2496 2507
2497 if (new_container) 2508 if (new_container)
2498 { 2509 {
… …
2508 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2519 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2509 new_container->insert (closer); 2520 new_container->insert (closer);
2510 } 2521 }
2511#endif 2522#endif
2512 2523
2513 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2524 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2514 2525
2515 // make sure the container is available, client bug requires this to be separate 2526 // make sure the container is available, client bug requires this to be separate
2516 esrv_send_item (this, new_container); 2527 esrv_send_item (this, new_container);
2517 2528
2518 new_container->flag [FLAG_APPLIED] = true; 2529 new_container->flag [FLAG_APPLIED] = true;
… …
2526// else if (!old_container->env && contr && contr->ns) 2537// else if (!old_container->env && contr && contr->ns)
2527// contr->ns->floorbox_reset (); 2538// contr->ns->floorbox_reset ();
2528} 2539}
2529 2540
2530object * 2541object *
2531object::force_find (const shstr name) 2542object::force_find (shstr_tmp name)
2532{ 2543{
2533 /* cycle through his inventory to look for the MARK we want to 2544 /* cycle through his inventory to look for the MARK we want to
2534 * place 2545 * place
2535 */ 2546 */
2536 for (object *tmp = inv; tmp; tmp = tmp->below) 2547 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2538 return splay (tmp); 2549 return splay (tmp);
2539 2550
2540 return 0; 2551 return 0;
2541} 2552}
2542 2553
2543void 2554object *
2544object::force_add (const shstr name, int duration) 2555object::force_add (shstr_tmp name, int duration)
2545{ 2556{
2546 if (object *force = force_find (name)) 2557 if (object *force = force_find (name))
2547 force->destroy (); 2558 force->destroy ();
2548 2559
2549 object *force = get_archetype (FORCE_NAME); 2560 object *force = get_archetype (FORCE_NAME);
… …
2554 2565
2555 force->set_speed (duration ? 1.f / duration : 0.f); 2566 force->set_speed (duration ? 1.f / duration : 0.f);
2556 force->flag [FLAG_IS_USED_UP] = true; 2567 force->flag [FLAG_IS_USED_UP] = true;
2557 force->flag [FLAG_APPLIED] = true; 2568 force->flag [FLAG_APPLIED] = true;
2558 2569
2559 insert (force); 2570 return insert (force);
2560} 2571}
2561 2572
2562void 2573void
2563object::play_sound (faceidx sound) 2574object::play_sound (faceidx sound) const
2564{ 2575{
2565 if (!sound) 2576 if (!sound)
2566 return; 2577 return;
2567 2578
2568 if (flag [FLAG_REMOVED]) 2579 if (is_on_map ())
2580 map->play_sound (sound, x, y);
2581 else if (object *pl = in_player ())
2582 pl->contr->play_sound (sound);
2583}
2584
2585void
2586object::say_msg (const char *msg) const
2587{
2588 if (is_on_map ())
2589 map->say_msg (msg, x, y);
2590 else if (object *pl = in_player ())
2591 pl->contr->play_sound (sound);
2592}
2593
2594void
2595object::make_noise ()
2596{
2597 // we do not model noise in the map, so instead put
2598 // a temporary light into the noise source
2599 // could use the map instead, but that's less reliable for our
2600 // goal, which is to make invisibility a bit harder to exploit
2601
2602 // currently only works sensibly for players
2603 if (!is_player ())
2569 return; 2604 return;
2570 2605
2571 if (env) 2606 // find old force, or create new one
2572 { 2607 object *force = force_find (shstr_noise_force);
2573 if (object *pl = in_player ()) 2608
2574 pl->contr->play_sound (sound); 2609 if (force)
2575 } 2610 force->speed_left = -1.f; // patch old speed up
2576 else 2611 else
2577 map->play_sound (sound, x, y); 2612 {
2578} 2613 force = archetype::get (shstr_noise_force);
2579 2614
2615 force->slaying = shstr_noise_force;
2616 force->stats.food = 1;
2617 force->speed_left = -1.f;
2618
2619 force->set_speed (1.f / 4.f);
2620 force->flag [FLAG_IS_USED_UP] = true;
2621 force->flag [FLAG_APPLIED] = true;
2622
2623 insert (force);
2624 }
2625}
2626

Diff Legend

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