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.157 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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 Crossfire TRT 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 it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
… …
300 return 0; 299 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 301 return 0;
303 } 302 }
304 303
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
307 { 305 {
308 ob1->optimise (); 306 ob1->optimise ();
309 ob2->optimise (); 307 ob2->optimise ();
310 308
311 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
312 return 0; 311 return 0;
313 } 312 }
314 313
315 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
316 return 1; 315 return 1;
317} 316}
… …
375/* 374/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
379 */ 378 */
380
381object * 379object *
382get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
383{ 381{
384 object *tmp, *closest; 382 object *tmp, *closest;
385 int last_dist, i; 383 int last_dist, i;
… …
430} 428}
431 429
432/* 430/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
435 */ 434 */
436void 435void
437object::set_owner (object *owner) 436object::set_owner (object *owner)
438{ 437{
438 // allow objects which own objects
439 if (!owner) 439 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 440 while (owner->owner)
450 owner = owner->owner; 441 owner = owner->owner;
451 442
452 this->owner = owner; 443 this->owner = owner;
453} 444}
454 445
455int 446int
… …
587object::copy_to (object *dst) 578object::copy_to (object *dst)
588{ 579{
589 *dst = *this; 580 *dst = *this;
590 581
591 if (speed < 0) 582 if (speed < 0)
592 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
593 584
594 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
595} 586}
596 587
597void 588void
… …
924 915
925 if (!freed_map) 916 if (!freed_map)
926 { 917 {
927 freed_map = new maptile; 918 freed_map = new maptile;
928 919
920 freed_map->path = "<freed objects map>";
929 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
930 freed_map->width = 3; 922 freed_map->width = 3;
931 freed_map->height = 3; 923 freed_map->height = 3;
932 924
933 freed_map->alloc (); 925 freed_map->alloc ();
… …
937 map = freed_map; 929 map = freed_map;
938 x = 1; 930 x = 1;
939 y = 1; 931 y = 1;
940 } 932 }
941 933
942 head = 0;
943
944 if (more) 934 if (more)
945 { 935 {
946 more->destroy (); 936 more->destroy ();
947 more = 0; 937 more = 0;
948 } 938 }
949 939
940 head = 0;
941
950 // clear those pointers that likely might have circular references to us 942 // clear those pointers that likely might cause circular references
951 owner = 0; 943 owner = 0;
952 enemy = 0; 944 enemy = 0;
953 attacked_by = 0; 945 attacked_by = 0;
946 current_weapon = 0;
954} 947}
955 948
956void 949void
957object::destroy (bool destroy_inventory) 950object::destroy (bool destroy_inventory)
958{ 951{
959 if (destroyed ()) 952 if (destroyed ())
960 return; 953 return;
961 954
962 if (destroy_inventory) 955 if (destroy_inventory)
963 destroy_inv (false); 956 destroy_inv (false);
957
958 if (is_head ())
959 if (sound_destroy)
960 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964 963
965 attachable::destroy (); 964 attachable::destroy ();
966} 965}
967 966
968/* 967/*
… …
1083 if (map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1084 return; 1083 return;
1085 1084
1086 int check_walk_off = !flag [FLAG_NO_APPLY]; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1087 1086
1087 if (object *pl = ms.player ())
1088 {
1089 if (pl->container == this)
1090 /* If a container that the player is currently using somehow gets
1091 * removed (most likely destroyed), update the player view
1092 * appropriately.
1093 */
1094 pl->close_container ();
1095
1096 pl->contr->ns->floorbox_update ();
1097 }
1098
1088 for (tmp = ms.bot; tmp; tmp = tmp->above) 1099 for (tmp = ms.bot; tmp; tmp = tmp->above)
1089 { 1100 {
1090 /* No point updating the players look faces if he is the object 1101 /* No point updating the players look faces if he is the object
1091 * being removed. 1102 * being removed.
1092 */ 1103 */
1093
1094 if (tmp->type == PLAYER && tmp != this)
1095 {
1096 /* If a container that the player is currently using somehow gets
1097 * removed (most likely destroyed), update the player view
1098 * appropriately.
1099 */
1100 if (tmp->container == this)
1101 {
1102 flag [FLAG_APPLIED] = 0;
1103 tmp->container = 0;
1104 }
1105
1106 if (tmp->contr->ns)
1107 tmp->contr->ns->floorbox_update ();
1108 }
1109 1104
1110 /* See if object moving off should effect something */ 1105 /* See if object moving off should effect something */
1111 if (check_walk_off 1106 if (check_walk_off
1112 && ((move_type & tmp->move_off) 1107 && ((move_type & tmp->move_off)
1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1116 1111
1117 if (destroyed ()) 1112 if (destroyed ())
1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1113 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1119 } 1114 }
1120 1115
1121 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1122 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1123 if (tmp->above == tmp)
1124 tmp->above = 0;
1125
1126 last = tmp; 1116 last = tmp;
1127 } 1117 }
1128 1118
1129 /* last == NULL if there are no objects on this space */ 1119 /* last == NULL if there are no objects on this space */
1130 //TODO: this makes little sense, why only update the topmost object? 1120 //TODO: this makes little sense, why only update the topmost object?
… …
1181 if (more) 1171 if (more)
1182 return; 1172 return;
1183 1173
1184 object *prev = this; 1174 object *prev = this;
1185 1175
1186 for (archetype *at = arch->more; at; at = at->more) 1176 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1187 { 1177 {
1188 object *op = arch_to_object (at); 1178 object *op = arch_to_object (at);
1189 1179
1190 op->name = name; 1180 op->name = name;
1191 op->name_pl = name_pl; 1181 op->name_pl = name_pl;
… …
1205object * 1195object *
1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1196insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1207{ 1197{
1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1198 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1209 { 1199 {
1210 tmp->x = x + tmp->arch->clone.x; 1200 tmp->x = x + tmp->arch->x;
1211 tmp->y = y + tmp->arch->clone.y; 1201 tmp->y = y + tmp->arch->y;
1212 } 1202 }
1213 1203
1214 return insert_ob_in_map (op, m, originator, flag); 1204 return insert_ob_in_map (op, m, originator, flag);
1215} 1205}
1216 1206
… …
1241 1231
1242 object *top, *floor = NULL; 1232 object *top, *floor = NULL;
1243 1233
1244 op->remove (); 1234 op->remove ();
1245 1235
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 1236 /* 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 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1275 * need extra work 1238 * need extra work
1276 */ 1239 */
1277 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1278 return 0; 1243 return 0;
1244 }
1245
1246 if (object *more = op->more)
1247 if (!insert_ob_in_map (more, m, originator, flag))
1248 return 0;
1249
1250 CLEAR_FLAG (op, FLAG_REMOVED);
1279 1251
1280 op->map = m; 1252 op->map = m;
1281 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1282 1254
1283 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
… …
1318 else 1290 else
1319 { 1291 {
1320 top = ms.bot; 1292 top = ms.bot;
1321 1293
1322 /* If there are other objects, then */ 1294 /* If there are other objects, then */
1323 if ((!(flag & INS_MAP_LOAD)) && top) 1295 if (top)
1324 { 1296 {
1325 object *last = 0; 1297 object *last = 0;
1326 1298
1327 /* 1299 /*
1328 * If there are multiple objects on this space, we do some trickier handling. 1300 * If there are multiple objects on this space, we do some trickier handling.
… …
1381 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1382 top = last->below; 1354 top = last->below;
1383 } 1355 }
1384 } /* If objects on this space */ 1356 } /* If objects on this space */
1385 1357
1386 if (flag & INS_MAP_LOAD)
1387 top = ms.top;
1388
1389 if (flag & INS_ABOVE_FLOOR_ONLY) 1358 if (flag & INS_ABOVE_FLOOR_ONLY)
1390 top = floor; 1359 top = floor;
1391 1360
1392 /* Top is the object that our object (op) is going to get inserted above. 1361 /* Top is the object that our object (op) is going to get inserted above.
1393 */ 1362 */
… …
1425 op->map->touch (); 1394 op->map->touch ();
1426 } 1395 }
1427 1396
1428 op->map->dirty = true; 1397 op->map->dirty = true;
1429 1398
1430 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there.
1432 */
1433 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = ms.player ()) 1399 if (object *pl = ms.player ())
1435 if (pl->contr->ns)
1436 pl->contr->ns->floorbox_update (); 1400 pl->contr->ns->floorbox_update ();
1437 1401
1438 /* If this object glows, it may affect lighting conditions that are 1402 /* If this object glows, it may affect lighting conditions that are
1439 * visible to others on this map. But update_all_los is really 1403 * visible to others on this map. But update_all_los is really
1440 * an inefficient way to do this, as it means los for all players 1404 * an inefficient way to do this, as it means los for all players
1441 * on the map will get recalculated. The players could very well 1405 * on the map will get recalculated. The players could very well
… …
1488 object *tmp, *tmp1; 1452 object *tmp, *tmp1;
1489 1453
1490 /* first search for itself and remove any old instances */ 1454 /* first search for itself and remove any old instances */
1491 1455
1492 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1456 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1493 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1457 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1494 tmp->destroy (); 1458 tmp->destroy ();
1495 1459
1496 tmp1 = arch_to_object (archetype::find (arch_string)); 1460 tmp1 = arch_to_object (archetype::find (arch_string));
1497 1461
1498 tmp1->x = op->x; 1462 tmp1->x = op->x;
… …
1679 * be != op, if items are merged. -Tero 1643 * be != op, if items are merged. -Tero
1680 */ 1644 */
1681object * 1645object *
1682object::insert (object *op) 1646object::insert (object *op)
1683{ 1647{
1684 object *tmp, *otmp;
1685
1686 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1648 if (!QUERY_FLAG (op, FLAG_REMOVED))
1687 op->remove (); 1649 op->remove ();
1688 1650
1689 if (op->more) 1651 if (op->more)
1690 { 1652 {
… …
1692 return op; 1654 return op;
1693 } 1655 }
1694 1656
1695 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1657 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1696 CLEAR_FLAG (op, FLAG_REMOVED); 1658 CLEAR_FLAG (op, FLAG_REMOVED);
1659
1697 if (op->nrof) 1660 if (op->nrof)
1698 { 1661 {
1699 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1662 for (object *tmp = inv; tmp; tmp = tmp->below)
1700 if (object::can_merge (tmp, op)) 1663 if (object::can_merge (tmp, op))
1701 { 1664 {
1702 /* return the original object and remove inserted object 1665 /* return the original object and remove inserted object
1703 (client needs the original object) */ 1666 (client needs the original object) */
1704 tmp->nrof += op->nrof; 1667 tmp->nrof += op->nrof;
… …
1723 add_weight (this, op->weight * op->nrof); 1686 add_weight (this, op->weight * op->nrof);
1724 } 1687 }
1725 else 1688 else
1726 add_weight (this, (op->weight + op->carrying)); 1689 add_weight (this, (op->weight + op->carrying));
1727 1690
1728 otmp = this->in_player (); 1691 if (object *otmp = this->in_player ())
1729 if (otmp && otmp->contr)
1730 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1692 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1731 otmp->update_stats (); 1693 otmp->update_stats ();
1732 1694
1695 op->owner = 0; // its his/hers now. period.
1733 op->map = 0; 1696 op->map = 0;
1734 op->env = this; 1697 op->env = this;
1735 op->above = 0; 1698 op->above = 0;
1736 op->below = 0; 1699 op->below = 0;
1737 op->x = 0, op->y = 0; 1700 op->x = op->y = 0;
1738 1701
1739 /* reset the light list and los of the players on the map */ 1702 /* reset the light list and los of the players on the map */
1740 if ((op->glow_radius != 0) && map) 1703 if (op->glow_radius && map)
1741 { 1704 {
1742#ifdef DEBUG_LIGHTS 1705#ifdef DEBUG_LIGHTS
1743 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1706 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1744#endif /* DEBUG_LIGHTS */ 1707#endif /* DEBUG_LIGHTS */
1745 if (map->darkness) 1708 if (map->darkness)
… …
2025 * customized, changed states, etc. 1988 * customized, changed states, etc.
2026 */ 1989 */
2027int 1990int
2028find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1991find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2029{ 1992{
1993 int altern[SIZEOFFREE];
2030 int index = 0, flag; 1994 int index = 0, flag;
2031 int altern[SIZEOFFREE];
2032 1995
2033 for (int i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2034 { 1997 {
2035 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 mapxy pos (m, x, y); pos.move (i);
2036 if (!flag) 1999
2000 if (!pos.normalise ())
2001 continue;
2002
2003 mapspace &ms = *pos;
2004
2005 if (ms.flags () & P_IS_ALIVE)
2006 continue;
2007
2008 /* However, often
2009 * ob doesn't have any move type (when used to place exits)
2010 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2011 */
2012 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2013 {
2037 altern [index++] = i; 2014 altern [index++] = i;
2015 continue;
2016 }
2038 2017
2039 /* Basically, if we find a wall on a space, we cut down the search size. 2018 /* Basically, if we find a wall on a space, we cut down the search size.
2040 * In this way, we won't return spaces that are on another side of a wall. 2019 * In this way, we won't return spaces that are on another side of a wall.
2041 * This mostly work, but it cuts down the search size in all directions - 2020 * This mostly work, but it cuts down the search size in all directions -
2042 * if the space being examined only has a wall to the north and empty 2021 * if the space being examined only has a wall to the north and empty
2043 * spaces in all the other directions, this will reduce the search space 2022 * spaces in all the other directions, this will reduce the search space
2044 * to only the spaces immediately surrounding the target area, and 2023 * to only the spaces immediately surrounding the target area, and
2045 * won't look 2 spaces south of the target space. 2024 * won't look 2 spaces south of the target space.
2046 */ 2025 */
2047 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2026 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2027 {
2048 stop = maxfree[i]; 2028 stop = maxfree[i];
2029 continue;
2030 }
2031
2032 /* Note it is intentional that we check ob - the movement type of the
2033 * head of the object should correspond for the entire object.
2034 */
2035 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2036 continue;
2037
2038 altern [index++] = i;
2049 } 2039 }
2050 2040
2051 if (!index) 2041 if (!index)
2052 return -1; 2042 return -1;
2053 2043
… …
2062 */ 2052 */
2063int 2053int
2064find_first_free_spot (const object *ob, maptile *m, int x, int y) 2054find_first_free_spot (const object *ob, maptile *m, int x, int y)
2065{ 2055{
2066 for (int i = 0; i < SIZEOFFREE; i++) 2056 for (int i = 0; i < SIZEOFFREE; i++)
2067 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2057 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2068 return i; 2058 return i;
2069 2059
2070 return -1; 2060 return -1;
2071} 2061}
2072 2062
… …
2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2339 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2350 * core dumps if they do. 2340 * core dumps if they do.
2351 * 2341 *
2352 * Add a check so we can't pick up invisible objects (0.93.8) 2342 * Add a check so we can't pick up invisible objects (0.93.8)
2353 */ 2343 */
2354
2355int 2344int
2356can_pick (const object *who, const object *item) 2345can_pick (const object *who, const object *item)
2357{ 2346{
2358 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2347 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2359 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2348 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2495 /* Basically, if the archetype has this key set, 2484 /* Basically, if the archetype has this key set,
2496 * we need to store the null value so when we save 2485 * we need to store the null value so when we save
2497 * it, we save the empty value so that when we load, 2486 * it, we save the empty value so that when we load,
2498 * we get this value back again. 2487 * we get this value back again.
2499 */ 2488 */
2500 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2489 if (get_ob_key_link (op->arch, canonical_key))
2501 field->value = 0; 2490 field->value = 0;
2502 else 2491 else
2503 { 2492 {
2504 if (last) 2493 if (last)
2505 last->next = field->next; 2494 last->next = field->next;
… …
2574 } 2563 }
2575 else 2564 else
2576 item = item->env; 2565 item = item->env;
2577} 2566}
2578 2567
2579
2580const char * 2568const char *
2581object::flag_desc (char *desc, int len) const 2569object::flag_desc (char *desc, int len) const
2582{ 2570{
2583 char *p = desc; 2571 char *p = desc;
2584 bool first = true; 2572 bool first = true;
… …
2618 &name, 2606 &name,
2619 title ? "\",title:\"" : "", 2607 title ? "\",title:\"" : "",
2620 title ? (const char *)title : "", 2608 title ? (const char *)title : "",
2621 flag_desc (flagdesc, 512), type); 2609 flag_desc (flagdesc, 512), type);
2622 2610
2623 if (env) 2611 if (!this->flag[FLAG_REMOVED] && env)
2624 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2612 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2625 2613
2626 if (map) 2614 if (map)
2627 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2615 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2628 2616
… …
2646} 2634}
2647 2635
2648const materialtype_t * 2636const materialtype_t *
2649object::dominant_material () const 2637object::dominant_material () const
2650{ 2638{
2651 if (materialtype_t *mat = name_to_material (materialname)) 2639 if (materialtype_t *mt = name_to_material (materialname))
2652 return mat; 2640 return mt;
2653 2641
2654 // omfg this is slow, this has to be temporary :)
2655 shstr unknown ("unknown");
2656
2657 return name_to_material (unknown); 2642 return name_to_material (shstr_unknown);
2658} 2643}
2659 2644
2660void 2645void
2661object::open_container (object *new_container) 2646object::open_container (object *new_container)
2662{ 2647{
… …
2678 old_container->flag [FLAG_APPLIED] = 0; 2663 old_container->flag [FLAG_APPLIED] = 0;
2679 container = 0; 2664 container = 0;
2680 2665
2681 esrv_update_item (UPD_FLAGS, this, old_container); 2666 esrv_update_item (UPD_FLAGS, this, old_container);
2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2667 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2668 play_sound (sound_find ("chest_close"));
2683 } 2669 }
2684 2670
2685 if (new_container) 2671 if (new_container)
2686 { 2672 {
2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2673 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2703 new_container->flag [FLAG_APPLIED] = 1; 2689 new_container->flag [FLAG_APPLIED] = 1;
2704 container = new_container; 2690 container = new_container;
2705 2691
2706 esrv_update_item (UPD_FLAGS, this, new_container); 2692 esrv_update_item (UPD_FLAGS, this, new_container);
2707 esrv_send_inventory (this, new_container); 2693 esrv_send_inventory (this, new_container);
2694 play_sound (sound_find ("chest_open"));
2695 }
2696}
2697
2698object *
2699object::force_find (const shstr name)
2700{
2701 /* cycle through his inventory to look for the MARK we want to
2702 * place
2703 */
2704 for (object *tmp = inv; tmp; tmp = tmp->below)
2705 if (tmp->type == FORCE && tmp->slaying == name)
2706 return splay (tmp);
2707
2708 return 0;
2709}
2710
2711void
2712object::force_add (const shstr name, int duration)
2713{
2714 if (object *force = force_find (name))
2715 force->destroy ();
2716
2717 object *force = get_archetype (FORCE_NAME);
2718
2719 force->slaying = name;
2720 force->stats.food = 1;
2721 force->speed_left = -1.f;
2722
2723 force->set_speed (duration ? 1.f / duration : 0.f);
2724 force->flag [FLAG_IS_USED_UP] = true;
2725 force->flag [FLAG_APPLIED] = true;
2726
2727 insert (force);
2728}
2729
2730void
2731object::play_sound (faceidx sound) const
2732{
2733 if (!sound)
2734 return;
2735
2736 if (flag [FLAG_REMOVED])
2737 return;
2738
2739 if (env)
2708 } 2740 {
2741 if (object *pl = in_player ())
2742 pl->contr->play_sound (sound);
2743 }
2744 else
2745 map->play_sound (sound, x, y);
2709} 2746}
2710 2747
2711

Diff Legend

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