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.172 by root, Wed Aug 1 20:44:11 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 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;
940 freed_map->nodrop = 1;
931 941
932 freed_map->alloc (); 942 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
934 } 944 }
935 945
… …
960 return; 970 return;
961 971
962 if (destroy_inventory) 972 if (destroy_inventory)
963 destroy_inv (false); 973 destroy_inv (false);
964 974
975 if (is_head ())
965 if (sound_destroy) 976 if (sound_destroy)
966 play_sound (sound_destroy); 977 play_sound (sound_destroy);
967 else if (flag [FLAG_MONSTER]) 978 else if (flag [FLAG_MONSTER])
968 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 979 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
969 980
970 attachable::destroy (); 981 attachable::destroy ();
971} 982}
972 983
973/* 984/*
… …
1088 if (map->in_memory == MAP_SAVING) 1099 if (map->in_memory == MAP_SAVING)
1089 return; 1100 return;
1090 1101
1091 int check_walk_off = !flag [FLAG_NO_APPLY]; 1102 int check_walk_off = !flag [FLAG_NO_APPLY];
1092 1103
1104 if (object *pl = ms.player ())
1105 {
1106 if (pl->container == this)
1107 /* If a container that the player is currently using somehow gets
1108 * removed (most likely destroyed), update the player view
1109 * appropriately.
1110 */
1111 pl->close_container ();
1112
1113 pl->contr->ns->floorbox_update ();
1114 }
1115
1093 for (tmp = ms.bot; tmp; tmp = tmp->above) 1116 for (tmp = ms.bot; tmp; tmp = tmp->above)
1094 { 1117 {
1095 /* No point updating the players look faces if he is the object 1118 /* No point updating the players look faces if he is the object
1096 * being removed. 1119 * being removed.
1097 */ 1120 */
1098
1099 if (tmp->type == PLAYER && tmp != this)
1100 {
1101 /* If a container that the player is currently using somehow gets
1102 * removed (most likely destroyed), update the player view
1103 * appropriately.
1104 */
1105 if (tmp->container == this)
1106 {
1107 flag [FLAG_APPLIED] = 0;
1108 tmp->container = 0;
1109 }
1110
1111 if (tmp->contr->ns)
1112 tmp->contr->ns->floorbox_update ();
1113 }
1114 1121
1115 /* See if object moving off should effect something */ 1122 /* See if object moving off should effect something */
1116 if (check_walk_off 1123 if (check_walk_off
1117 && ((move_type & tmp->move_off) 1124 && ((move_type & tmp->move_off)
1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1125 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1150merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1151{ 1158{
1152 if (!op->nrof) 1159 if (!op->nrof)
1153 return 0; 1160 return 0;
1154 1161
1155 if (top) 1162 if (!top)
1156 for (top = op; top && top->above; top = top->above) 1163 for (top = op; top && top->above; top = top->above)
1157 ; 1164 ;
1158 1165
1159 for (; top; top = top->below) 1166 for (; top; top = top->below)
1160 { 1167 {
… …
1241 1248
1242 object *top, *floor = NULL; 1249 object *top, *floor = NULL;
1243 1250
1244 op->remove (); 1251 op->remove ();
1245 1252
1246#if 0
1247 if (!m->active != !op->active)
1248 if (m->active)
1249 op->activate_recursive ();
1250 else
1251 op->deactivate_recursive ();
1252#endif
1253
1254 if (out_of_map (m, op->x, op->y))
1255 {
1256 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1257#ifdef MANY_CORES
1258 /* Better to catch this here, as otherwise the next use of this object
1259 * is likely to cause a crash. Better to find out where it is getting
1260 * improperly inserted.
1261 */
1262 abort ();
1263#endif
1264 return op;
1265 }
1266
1267 if (object *more = op->more)
1268 if (!insert_ob_in_map (more, m, originator, flag))
1269 return 0;
1270
1271 CLEAR_FLAG (op, FLAG_REMOVED);
1272
1273 /* Ideally, the caller figures this out. However, it complicates a lot 1253 /* Ideally, the caller figures this out. However, it complicates a lot
1274 * of areas of callers (eg, anything that uses find_free_spot would now 1254 * of areas of callers (eg, anything that uses find_free_spot would now
1275 * need extra work 1255 * need extra work
1276 */ 1256 */
1277 if (!xy_normalise (m, op->x, op->y)) 1257 if (!xy_normalise (m, op->x, op->y))
1258 {
1259 op->destroy ();
1278 return 0; 1260 return 0;
1261 }
1262
1263 if (object *more = op->more)
1264 if (!insert_ob_in_map (more, m, originator, flag))
1265 return 0;
1266
1267 CLEAR_FLAG (op, FLAG_REMOVED);
1279 1268
1280 op->map = m; 1269 op->map = m;
1281 mapspace &ms = op->ms (); 1270 mapspace &ms = op->ms ();
1282 1271
1283 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
… …
1318 else 1307 else
1319 { 1308 {
1320 top = ms.bot; 1309 top = ms.bot;
1321 1310
1322 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1323 if ((!(flag & INS_MAP_LOAD)) && top) 1312 if (top)
1324 { 1313 {
1325 object *last = 0; 1314 object *last = 0;
1326 1315
1327 /* 1316 /*
1328 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
… …
1380 */ 1369 */
1381 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1382 top = last->below; 1371 top = last->below;
1383 } 1372 }
1384 } /* If objects on this space */ 1373 } /* If objects on this space */
1385 if (flag & INS_MAP_LOAD)
1386 top = ms.top;
1387 1374
1388 if (flag & INS_ABOVE_FLOOR_ONLY) 1375 if (flag & INS_ABOVE_FLOOR_ONLY)
1389 top = floor; 1376 top = floor;
1390 1377
1391 /* Top is the object that our object (op) is going to get inserted above. 1378 /* Top is the object that our object (op) is going to get inserted above.
… …
1424 op->map->touch (); 1411 op->map->touch ();
1425 } 1412 }
1426 1413
1427 op->map->dirty = true; 1414 op->map->dirty = true;
1428 1415
1429 /* If we have a floor, we know the player, if any, will be above
1430 * it, so save a few ticks and start from there.
1431 */
1432 if (!(flag & INS_MAP_LOAD))
1433 if (object *pl = ms.player ()) 1416 if (object *pl = ms.player ())
1434 if (pl->contr->ns)
1435 pl->contr->ns->floorbox_update (); 1417 pl->contr->ns->floorbox_update ();
1436 1418
1437 /* If this object glows, it may affect lighting conditions that are 1419 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1420 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1421 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1422 * on the map will get recalculated. The players could very well
… …
1678 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1679 */ 1661 */
1680object * 1662object *
1681object::insert (object *op) 1663object::insert (object *op)
1682{ 1664{
1683 object *tmp, *otmp;
1684
1685 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1686 op->remove (); 1666 op->remove ();
1687 1667
1688 if (op->more) 1668 if (op->more)
1689 { 1669 {
… …
1691 return op; 1671 return op;
1692 } 1672 }
1693 1673
1694 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1695 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1696 if (op->nrof) 1677 if (op->nrof)
1697 { 1678 {
1698 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1699 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1700 { 1681 {
1701 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1702 (client needs the original object) */ 1683 (client needs the original object) */
1703 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
… …
1722 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1723 } 1704 }
1724 else 1705 else
1725 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1726 1707
1727 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1728 if (otmp && otmp->contr)
1729 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1730 otmp->update_stats (); 1710 otmp->update_stats ();
1731 1711
1712 op->owner = 0; // its his/hers now. period.
1732 op->map = 0; 1713 op->map = 0;
1733 op->env = this; 1714 op->env = this;
1734 op->above = 0; 1715 op->above = 0;
1735 op->below = 0; 1716 op->below = 0;
1736 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1737 1718
1738 /* reset the light list and los of the players on the map */ 1719 /* reset the light list and los of the players on the map */
1739 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1740 { 1721 {
1741#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1742 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1743#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1744 if (map->darkness) 1725 if (map->darkness)
… …
1978 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1979 */ 1960 */
1980void 1961void
1981flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1982{ 1963{
1983 if (op->inv)
1984 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1985 { 1965 {
1986 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1987 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1988 } 1968 }
1989} 1969}
1990 1970
1991/* 1971/*
1992 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1993 */ 1973 */
1994void 1974void
1995unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1996{ 1976{
1997 if (op->inv)
1998 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1999 { 1978 {
2000 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
2001 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
2002 } 1981 }
2003} 1982}
2004 1983
2005/* 1984/*
2006 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * find_free_spot(object, map, x, y, start, stop) will search for
2007 * a spot at the given map and coordinates which will be able to contain 1986 * a spot at the given map and coordinates which will be able to contain
… …
2009 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
2010 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
2011 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
2012 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
2013 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2014 * Note - this only checks to see if there is space for the head of the
2015 * object - if it is a multispace object, this should be called for all
2016 * pieces.
2017 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
2018 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
2019 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
2020 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
2021 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
2022 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
… …
2024 * customized, changed states, etc. 2000 * customized, changed states, etc.
2025 */ 2001 */
2026int 2002int
2027find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2028{ 2004{
2005 int altern[SIZEOFFREE];
2029 int index = 0, flag; 2006 int index = 0, flag;
2030 int altern[SIZEOFFREE];
2031 2007
2032 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
2033 { 2009 {
2034 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
2035 if (!flag) 2011
2012 if (!pos.normalise ())
2013 continue;
2014
2015 mapspace &ms = *pos;
2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2019
2020 /* However, often
2021 * ob doesn't have any move type (when used to place exits)
2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2023 */
2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
2036 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
2037 2029
2038 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* Basically, if we find a wall on a space, we cut down the search size.
2039 * In this way, we won't return spaces that are on another side of a wall. 2031 * In this way, we won't return spaces that are on another side of a wall.
2040 * This mostly work, but it cuts down the search size in all directions - 2032 * This mostly work, but it cuts down the search size in all directions -
2041 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
2042 * spaces in all the other directions, this will reduce the search space 2034 * spaces in all the other directions, this will reduce the search space
2043 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2044 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2045 */ 2037 */
2046 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2047 stop = maxfree[i]; 2040 stop = maxfree[i];
2041 continue;
2042 }
2043
2044 /* Note it is intentional that we check ob - the movement type of the
2045 * head of the object should correspond for the entire object.
2046 */
2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2051 continue;
2052
2053 altern [index++] = i;
2048 } 2054 }
2049 2055
2050 if (!index) 2056 if (!index)
2051 return -1; 2057 return -1;
2052 2058
… …
2061 */ 2067 */
2062int 2068int
2063find_first_free_spot (const object *ob, maptile *m, int x, int y) 2069find_first_free_spot (const object *ob, maptile *m, int x, int y)
2064{ 2070{
2065 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2066 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2072 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2067 return i; 2073 return i;
2068 2074
2069 return -1; 2075 return -1;
2070} 2076}
2071 2077
… …
2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2349 * core dumps if they do. 2355 * core dumps if they do.
2350 * 2356 *
2351 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2352 */ 2358 */
2353
2354int 2359int
2355can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2356{ 2361{
2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2616 &name, 2621 &name,
2617 title ? "\",title:\"" : "", 2622 title ? "\",title:\"" : "",
2618 title ? (const char *)title : "", 2623 title ? (const char *)title : "",
2619 flag_desc (flagdesc, 512), type); 2624 flag_desc (flagdesc, 512), type);
2620 2625
2621 if (env) 2626 if (!this->flag[FLAG_REMOVED] && env)
2622 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2627 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2623 2628
2624 if (map) 2629 if (map)
2625 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2630 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2626 2631
… …
2673 old_container->flag [FLAG_APPLIED] = 0; 2678 old_container->flag [FLAG_APPLIED] = 0;
2674 container = 0; 2679 container = 0;
2675 2680
2676 esrv_update_item (UPD_FLAGS, this, old_container); 2681 esrv_update_item (UPD_FLAGS, this, old_container);
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683 play_sound (sound_find ("chest_close"));
2678 } 2684 }
2679 2685
2680 if (new_container) 2686 if (new_container)
2681 { 2687 {
2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2688 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2698 new_container->flag [FLAG_APPLIED] = 1; 2704 new_container->flag [FLAG_APPLIED] = 1;
2699 container = new_container; 2705 container = new_container;
2700 2706
2701 esrv_update_item (UPD_FLAGS, this, new_container); 2707 esrv_update_item (UPD_FLAGS, this, new_container);
2702 esrv_send_inventory (this, new_container); 2708 esrv_send_inventory (this, new_container);
2709 play_sound (sound_find ("chest_open"));
2703 } 2710 }
2704} 2711}
2705 2712
2706object * 2713object *
2707object::force_find (const shstr name) 2714object::force_find (const shstr name)
… …
2733 force->flag [FLAG_APPLIED] = true; 2740 force->flag [FLAG_APPLIED] = true;
2734 2741
2735 insert (force); 2742 insert (force);
2736} 2743}
2737 2744
2745void
2746object::play_sound (faceidx sound) const
2747{
2748 if (!sound)
2749 return;
2750
2751 if (flag [FLAG_REMOVED])
2752 return;
2753
2754 if (env)
2755 {
2756 if (object *pl = in_player ())
2757 pl->contr->play_sound (sound);
2758 }
2759 else
2760 map->play_sound (sound, x, y);
2761}
2762

Diff Legend

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