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.174 by root, Wed Aug 8 04:52:59 2007 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 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 * Crossfire TRT 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
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
254 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 255 * check all objects in the inventory.
256 */ 256 */
257 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
258 { 258 {
259 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
261 return 0;
262 261
263 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
264 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 266 return 0; /* inventory objexts differ */
266 267
267 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 269 * if it is valid.
269 */ 270 */
270 } 271 }
… …
305 { 306 {
306 ob1->optimise (); 307 ob1->optimise ();
307 ob2->optimise (); 308 ob2->optimise ();
308 309
309 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2)) 311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
311 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
312 } 322 }
313 323
314 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
315 return 1; 325 return 1;
316} 326}
… …
374/* 384/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
378 */ 388 */
379
380object * 389object *
381get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
382{ 391{
383 object *tmp, *closest; 392 object *tmp, *closest;
384 int last_dist, i; 393 int last_dist, i;
… …
429} 438}
430 439
431/* 440/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
434 */ 444 */
435void 445void
436object::set_owner (object *owner) 446object::set_owner (object *owner)
437{ 447{
448 // allow objects which own objects
438 if (!owner) 449 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) 450 while (owner->owner)
449 owner = owner->owner; 451 owner = owner->owner;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
450 458
451 this->owner = owner; 459 this->owner = owner;
452} 460}
453 461
454int 462int
… …
586object::copy_to (object *dst) 594object::copy_to (object *dst)
587{ 595{
588 *dst = *this; 596 *dst = *this;
589 597
590 if (speed < 0) 598 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 599 dst->speed_left -= rndm ();
592 600
593 dst->set_speed (dst->speed); 601 dst->set_speed (dst->speed);
594} 602}
595 603
596void 604void
… …
923 931
924 if (!freed_map) 932 if (!freed_map)
925 { 933 {
926 freed_map = new maptile; 934 freed_map = new maptile;
927 935
936 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 938 freed_map->width = 3;
930 freed_map->height = 3; 939 freed_map->height = 3;
931 940
932 freed_map->alloc (); 941 freed_map->alloc ();
… …
1089 if (map->in_memory == MAP_SAVING) 1098 if (map->in_memory == MAP_SAVING)
1090 return; 1099 return;
1091 1100
1092 int check_walk_off = !flag [FLAG_NO_APPLY]; 1101 int check_walk_off = !flag [FLAG_NO_APPLY];
1093 1102
1094 for (tmp = ms.bot; tmp; tmp = tmp->above) 1103 if (object *pl = ms.player ())
1095 { 1104 {
1096 /* No point updating the players look faces if he is the object 1105 if (pl->container == this)
1097 * being removed.
1098 */
1099
1100 if (tmp->type == PLAYER && tmp->container == this)
1101 /* If a container that the player is currently using somehow gets 1106 /* If a container that the player is currently using somehow gets
1102 * removed (most likely destroyed), update the player view 1107 * removed (most likely destroyed), update the player view
1103 * appropriately. 1108 * appropriately.
1104 */ 1109 */
1105 tmp->close_container (); 1110 pl->close_container ();
1111
1112 pl->contr->ns->floorbox_update ();
1113 }
1114
1115 for (tmp = ms.bot; tmp; tmp = tmp->above)
1116 {
1117 /* No point updating the players look faces if he is the object
1118 * being removed.
1119 */
1106 1120
1107 /* See if object moving off should effect something */ 1121 /* See if object moving off should effect something */
1108 if (check_walk_off 1122 if (check_walk_off
1109 && ((move_type & tmp->move_off) 1123 && ((move_type & tmp->move_off)
1110 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1124 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1142merge_ob (object *op, object *top) 1156merge_ob (object *op, object *top)
1143{ 1157{
1144 if (!op->nrof) 1158 if (!op->nrof)
1145 return 0; 1159 return 0;
1146 1160
1147 if (top) 1161 if (!top)
1148 for (top = op; top && top->above; top = top->above) 1162 for (top = op; top && top->above; top = top->above)
1149 ; 1163 ;
1150 1164
1151 for (; top; top = top->below) 1165 for (; top; top = top->below)
1152 { 1166 {
… …
1233 1247
1234 object *top, *floor = NULL; 1248 object *top, *floor = NULL;
1235 1249
1236 op->remove (); 1250 op->remove ();
1237 1251
1238#if 0
1239 if (!m->active != !op->active)
1240 if (m->active)
1241 op->activate_recursive ();
1242 else
1243 op->deactivate_recursive ();
1244#endif
1245
1246 if (out_of_map (m, op->x, op->y))
1247 {
1248 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1249#ifdef MANY_CORES
1250 /* Better to catch this here, as otherwise the next use of this object
1251 * is likely to cause a crash. Better to find out where it is getting
1252 * improperly inserted.
1253 */
1254 abort ();
1255#endif
1256 return op;
1257 }
1258
1259 if (object *more = op->more)
1260 if (!insert_ob_in_map (more, m, originator, flag))
1261 return 0;
1262
1263 CLEAR_FLAG (op, FLAG_REMOVED);
1264
1265 /* Ideally, the caller figures this out. However, it complicates a lot 1252 /* Ideally, the caller figures this out. However, it complicates a lot
1266 * of areas of callers (eg, anything that uses find_free_spot would now 1253 * of areas of callers (eg, anything that uses find_free_spot would now
1267 * need extra work 1254 * need extra work
1268 */ 1255 */
1269 if (!xy_normalise (m, op->x, op->y)) 1256 if (!xy_normalise (m, op->x, op->y))
1257 {
1258 op->destroy ();
1270 return 0; 1259 return 0;
1260 }
1261
1262 if (object *more = op->more)
1263 if (!insert_ob_in_map (more, m, originator, flag))
1264 return 0;
1265
1266 CLEAR_FLAG (op, FLAG_REMOVED);
1271 1267
1272 op->map = m; 1268 op->map = m;
1273 mapspace &ms = op->ms (); 1269 mapspace &ms = op->ms ();
1274 1270
1275 /* this has to be done after we translate the coordinates. 1271 /* this has to be done after we translate the coordinates.
… …
1310 else 1306 else
1311 { 1307 {
1312 top = ms.bot; 1308 top = ms.bot;
1313 1309
1314 /* If there are other objects, then */ 1310 /* If there are other objects, then */
1315 if ((!(flag & INS_MAP_LOAD)) && top) 1311 if (top)
1316 { 1312 {
1317 object *last = 0; 1313 object *last = 0;
1318 1314
1319 /* 1315 /*
1320 * If there are multiple objects on this space, we do some trickier handling. 1316 * If there are multiple objects on this space, we do some trickier handling.
… …
1372 */ 1368 */
1373 if (last && last->below && last != floor) 1369 if (last && last->below && last != floor)
1374 top = last->below; 1370 top = last->below;
1375 } 1371 }
1376 } /* If objects on this space */ 1372 } /* If objects on this space */
1377 if (flag & INS_MAP_LOAD)
1378 top = ms.top;
1379 1373
1380 if (flag & INS_ABOVE_FLOOR_ONLY) 1374 if (flag & INS_ABOVE_FLOOR_ONLY)
1381 top = floor; 1375 top = floor;
1382 1376
1383 /* Top is the object that our object (op) is going to get inserted above. 1377 /* Top is the object that our object (op) is going to get inserted above.
… …
1416 op->map->touch (); 1410 op->map->touch ();
1417 } 1411 }
1418 1412
1419 op->map->dirty = true; 1413 op->map->dirty = true;
1420 1414
1421 /* If we have a floor, we know the player, if any, will be above
1422 * it, so save a few ticks and start from there.
1423 */
1424 if (!(flag & INS_MAP_LOAD))
1425 if (object *pl = ms.player ()) 1415 if (object *pl = ms.player ())
1426 if (pl->contr->ns)
1427 pl->contr->ns->floorbox_update (); 1416 pl->contr->ns->floorbox_update ();
1428 1417
1429 /* If this object glows, it may affect lighting conditions that are 1418 /* If this object glows, it may affect lighting conditions that are
1430 * visible to others on this map. But update_all_los is really 1419 * visible to others on this map. But update_all_los is really
1431 * an inefficient way to do this, as it means los for all players 1420 * an inefficient way to do this, as it means los for all players
1432 * on the map will get recalculated. The players could very well 1421 * on the map will get recalculated. The players could very well
… …
1670 * be != op, if items are merged. -Tero 1659 * be != op, if items are merged. -Tero
1671 */ 1660 */
1672object * 1661object *
1673object::insert (object *op) 1662object::insert (object *op)
1674{ 1663{
1675 object *tmp, *otmp;
1676
1677 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1664 if (!QUERY_FLAG (op, FLAG_REMOVED))
1678 op->remove (); 1665 op->remove ();
1679 1666
1680 if (op->more) 1667 if (op->more)
1681 { 1668 {
… …
1683 return op; 1670 return op;
1684 } 1671 }
1685 1672
1686 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1673 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1687 CLEAR_FLAG (op, FLAG_REMOVED); 1674 CLEAR_FLAG (op, FLAG_REMOVED);
1675
1688 if (op->nrof) 1676 if (op->nrof)
1689 { 1677 {
1690 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1678 for (object *tmp = inv; tmp; tmp = tmp->below)
1691 if (object::can_merge (tmp, op)) 1679 if (object::can_merge (tmp, op))
1692 { 1680 {
1693 /* return the original object and remove inserted object 1681 /* return the original object and remove inserted object
1694 (client needs the original object) */ 1682 (client needs the original object) */
1695 tmp->nrof += op->nrof; 1683 tmp->nrof += op->nrof;
… …
1714 add_weight (this, op->weight * op->nrof); 1702 add_weight (this, op->weight * op->nrof);
1715 } 1703 }
1716 else 1704 else
1717 add_weight (this, (op->weight + op->carrying)); 1705 add_weight (this, (op->weight + op->carrying));
1718 1706
1719 otmp = this->in_player (); 1707 if (object *otmp = this->in_player ())
1720 if (otmp && otmp->contr)
1721 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1708 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1722 otmp->update_stats (); 1709 otmp->update_stats ();
1723 1710
1711 op->owner = 0; // its his/hers now. period.
1724 op->map = 0; 1712 op->map = 0;
1725 op->env = this; 1713 op->env = this;
1726 op->above = 0; 1714 op->above = 0;
1727 op->below = 0; 1715 op->below = 0;
1728 op->x = 0, op->y = 0; 1716 op->x = op->y = 0;
1729 1717
1730 /* reset the light list and los of the players on the map */ 1718 /* reset the light list and los of the players on the map */
1731 if ((op->glow_radius != 0) && map) 1719 if (op->glow_radius && map)
1732 { 1720 {
1733#ifdef DEBUG_LIGHTS 1721#ifdef DEBUG_LIGHTS
1734 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1722 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1735#endif /* DEBUG_LIGHTS */ 1723#endif /* DEBUG_LIGHTS */
1736 if (map->darkness) 1724 if (map->darkness)
… …
1970 * activate recursively a flag on an object inventory 1958 * activate recursively a flag on an object inventory
1971 */ 1959 */
1972void 1960void
1973flag_inv (object *op, int flag) 1961flag_inv (object *op, int flag)
1974{ 1962{
1975 if (op->inv)
1976 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1977 { 1964 {
1978 SET_FLAG (tmp, flag); 1965 SET_FLAG (tmp, flag);
1979 flag_inv (tmp, flag); 1966 flag_inv (tmp, flag);
1980 } 1967 }
1981} 1968}
1982 1969
1983/* 1970/*
1984 * deactivate recursively a flag on an object inventory 1971 * deactivate recursively a flag on an object inventory
1985 */ 1972 */
1986void 1973void
1987unflag_inv (object *op, int flag) 1974unflag_inv (object *op, int flag)
1988{ 1975{
1989 if (op->inv)
1990 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1976 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1991 { 1977 {
1992 CLEAR_FLAG (tmp, flag); 1978 CLEAR_FLAG (tmp, flag);
1993 unflag_inv (tmp, flag); 1979 unflag_inv (tmp, flag);
1994 } 1980 }
1995} 1981}
1996 1982
1997/* 1983/*
1998 * find_free_spot(object, map, x, y, start, stop) will search for 1984 * find_free_spot(object, map, x, y, start, stop) will search for
1999 * a spot at the given map and coordinates which will be able to contain 1985 * a spot at the given map and coordinates which will be able to contain
… …
2001 * to search (see the freearr_x/y[] definition). 1987 * to search (see the freearr_x/y[] definition).
2002 * It returns a random choice among the alternatives found. 1988 * It returns a random choice among the alternatives found.
2003 * start and stop are where to start relative to the free_arr array (1,9 1989 * start and stop are where to start relative to the free_arr array (1,9
2004 * does all 4 immediate directions). This returns the index into the 1990 * does all 4 immediate directions). This returns the index into the
2005 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1991 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2006 * Note - this only checks to see if there is space for the head of the
2007 * object - if it is a multispace object, this should be called for all
2008 * pieces.
2009 * Note2: This function does correctly handle tiled maps, but does not 1992 * Note: This function does correctly handle tiled maps, but does not
2010 * inform the caller. However, insert_ob_in_map will update as 1993 * inform the caller. However, insert_ob_in_map will update as
2011 * necessary, so the caller shouldn't need to do any special work. 1994 * necessary, so the caller shouldn't need to do any special work.
2012 * Note - updated to take an object instead of archetype - this is necessary 1995 * Note - updated to take an object instead of archetype - this is necessary
2013 * because arch_blocked (now ob_blocked) needs to know the movement type 1996 * because arch_blocked (now ob_blocked) needs to know the movement type
2014 * to know if the space in question will block the object. We can't use 1997 * to know if the space in question will block the object. We can't use
… …
2016 * customized, changed states, etc. 1999 * customized, changed states, etc.
2017 */ 2000 */
2018int 2001int
2019find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2002find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2020{ 2003{
2004 int altern[SIZEOFFREE];
2021 int index = 0, flag; 2005 int index = 0, flag;
2022 int altern[SIZEOFFREE];
2023 2006
2024 for (int i = start; i < stop; i++) 2007 for (int i = start; i < stop; i++)
2025 { 2008 {
2026 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2009 mapxy pos (m, x, y); pos.move (i);
2027 if (!flag) 2010
2011 if (!pos.normalise ())
2012 continue;
2013
2014 mapspace &ms = *pos;
2015
2016 if (ms.flags () & P_IS_ALIVE)
2017 continue;
2018
2019 /* However, often
2020 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */
2023 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 {
2028 altern [index++] = i; 2025 altern [index++] = i;
2026 continue;
2027 }
2029 2028
2030 /* Basically, if we find a wall on a space, we cut down the search size. 2029 /* Basically, if we find a wall on a space, we cut down the search size.
2031 * In this way, we won't return spaces that are on another side of a wall. 2030 * In this way, we won't return spaces that are on another side of a wall.
2032 * This mostly work, but it cuts down the search size in all directions - 2031 * This mostly work, but it cuts down the search size in all directions -
2033 * if the space being examined only has a wall to the north and empty 2032 * if the space being examined only has a wall to the north and empty
2034 * spaces in all the other directions, this will reduce the search space 2033 * spaces in all the other directions, this will reduce the search space
2035 * to only the spaces immediately surrounding the target area, and 2034 * to only the spaces immediately surrounding the target area, and
2036 * won't look 2 spaces south of the target space. 2035 * won't look 2 spaces south of the target space.
2037 */ 2036 */
2038 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2037 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2038 {
2039 stop = maxfree[i]; 2039 stop = maxfree[i];
2040 continue;
2041 }
2042
2043 /* Note it is intentional that we check ob - the movement type of the
2044 * head of the object should correspond for the entire object.
2045 */
2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047 continue;
2048
2049 if (ob->blocked (m, pos.x, pos.y))
2050 continue;
2051
2052 altern [index++] = i;
2040 } 2053 }
2041 2054
2042 if (!index) 2055 if (!index)
2043 return -1; 2056 return -1;
2044 2057
… …
2053 */ 2066 */
2054int 2067int
2055find_first_free_spot (const object *ob, maptile *m, int x, int y) 2068find_first_free_spot (const object *ob, maptile *m, int x, int y)
2056{ 2069{
2057 for (int i = 0; i < SIZEOFFREE; i++) 2070 for (int i = 0; i < SIZEOFFREE; i++)
2058 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2071 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2059 return i; 2072 return i;
2060 2073
2061 return -1; 2074 return -1;
2062} 2075}
2063 2076
… …
2340 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2353 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341 * core dumps if they do. 2354 * core dumps if they do.
2342 * 2355 *
2343 * Add a check so we can't pick up invisible objects (0.93.8) 2356 * Add a check so we can't pick up invisible objects (0.93.8)
2344 */ 2357 */
2345
2346int 2358int
2347can_pick (const object *who, const object *item) 2359can_pick (const object *who, const object *item)
2348{ 2360{
2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2361 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2362 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2608 &name, 2620 &name,
2609 title ? "\",title:\"" : "", 2621 title ? "\",title:\"" : "",
2610 title ? (const char *)title : "", 2622 title ? (const char *)title : "",
2611 flag_desc (flagdesc, 512), type); 2623 flag_desc (flagdesc, 512), type);
2612 2624
2613 if (env) 2625 if (!this->flag[FLAG_REMOVED] && env)
2614 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2626 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2615 2627
2616 if (map) 2628 if (map)
2617 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2629 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2618 2630
… …
2665 old_container->flag [FLAG_APPLIED] = 0; 2677 old_container->flag [FLAG_APPLIED] = 0;
2666 container = 0; 2678 container = 0;
2667 2679
2668 esrv_update_item (UPD_FLAGS, this, old_container); 2680 esrv_update_item (UPD_FLAGS, this, old_container);
2669 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2682 play_sound (sound_find ("chest_close"));
2670 } 2683 }
2671 2684
2672 if (new_container) 2685 if (new_container)
2673 { 2686 {
2674 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2690 new_container->flag [FLAG_APPLIED] = 1; 2703 new_container->flag [FLAG_APPLIED] = 1;
2691 container = new_container; 2704 container = new_container;
2692 2705
2693 esrv_update_item (UPD_FLAGS, this, new_container); 2706 esrv_update_item (UPD_FLAGS, this, new_container);
2694 esrv_send_inventory (this, new_container); 2707 esrv_send_inventory (this, new_container);
2708 play_sound (sound_find ("chest_open"));
2695 } 2709 }
2696} 2710}
2697 2711
2698object * 2712object *
2699object::force_find (const shstr name) 2713object::force_find (const shstr name)
… …
2725 force->flag [FLAG_APPLIED] = true; 2739 force->flag [FLAG_APPLIED] = true;
2726 2740
2727 insert (force); 2741 insert (force);
2728} 2742}
2729 2743
2744void
2745object::play_sound (faceidx sound) const
2746{
2747 if (!sound)
2748 return;
2749
2750 if (flag [FLAG_REMOVED])
2751 return;
2752
2753 if (env)
2754 {
2755 if (object *pl = in_player ())
2756 pl->contr->play_sound (sound);
2757 }
2758 else
2759 map->play_sound (sound, x, y);
2760}
2761

Diff Legend

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