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.155 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.194 by root, Tue Oct 16 00:30:24 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 2 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <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.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
258 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
259 { 258 {
260 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
262 return 0;
263 261
264 /* 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
265 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 266 return 0; /* inventory objexts differ */
267 267
268 /* 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
269 * if it is valid. 269 * if it is valid.
270 */ 270 */
271 } 271 }
… …
300 return 0; 300 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 302 return 0;
303 } 303 }
304 304
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
307 { 306 {
308 ob1->optimise (); 307 ob1->optimise ();
309 ob2->optimise (); 308 ob2->optimise ();
310 309
311 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
314
315 if (k1 != k2)
312 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 }
313 } 322 }
314 323
315 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
316 return 1; 325 return 1;
317} 326}
… …
375/* 384/*
376 * 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
377 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
379 */ 388 */
380
381object * 389object *
382get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
383{ 391{
384 object *tmp, *closest; 392 object *tmp, *closest;
385 int last_dist, i; 393 int last_dist, i;
… …
430} 438}
431 439
432/* 440/*
433 * 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
434 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
435 */ 444 */
436void 445void
437object::set_owner (object *owner) 446object::set_owner (object *owner)
438{ 447{
448 // allow objects which own objects
439 if (!owner) 449 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) 450 while (owner->owner)
450 owner = owner->owner; 451 owner = owner->owner;
451 452
452 this->owner = owner; 453 this->owner = owner;
453} 454}
454 455
455int 456int
… …
495 { 496 {
496 current_weapon = chosen_skill = 0; 497 current_weapon = chosen_skill = 0;
497 update_stats (); 498 update_stats ();
498 499
499 new_draw_info_format (NDI_UNIQUE, 0, this, 500 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. " 501 "You try to balance all your items at once, "
502 "but the %s is just too much for your body. "
501 "You need to unapply some items first.", &ob->name); 503 "[You need to unapply some items first.]", &ob->name);
502 return false; 504 return false;
503 } 505 }
504 506
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 507 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 } 508 }
… …
586object::copy_to (object *dst) 588object::copy_to (object *dst)
587{ 589{
588 *dst = *this; 590 *dst = *this;
589 591
590 if (speed < 0) 592 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 593 dst->speed_left -= rndm ();
592 594
593 dst->set_speed (dst->speed); 595 dst->set_speed (dst->speed);
594} 596}
595 597
596void 598void
… …
923 925
924 if (!freed_map) 926 if (!freed_map)
925 { 927 {
926 freed_map = new maptile; 928 freed_map = new maptile;
927 929
930 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 931 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 932 freed_map->width = 3;
930 freed_map->height = 3; 933 freed_map->height = 3;
931 934
932 freed_map->alloc (); 935 freed_map->alloc ();
… …
936 map = freed_map; 939 map = freed_map;
937 x = 1; 940 x = 1;
938 y = 1; 941 y = 1;
939 } 942 }
940 943
941 head = 0;
942
943 if (more) 944 if (more)
944 { 945 {
945 more->destroy (); 946 more->destroy ();
946 more = 0; 947 more = 0;
947 } 948 }
948 949
950 head = 0;
951
949 // clear those pointers that likely might have circular references to us 952 // clear those pointers that likely might cause circular references
950 owner = 0; 953 owner = 0;
951 enemy = 0; 954 enemy = 0;
952 attacked_by = 0; 955 attacked_by = 0;
956 current_weapon = 0;
953} 957}
954 958
955void 959void
956object::destroy (bool destroy_inventory) 960object::destroy (bool destroy_inventory)
957{ 961{
958 if (destroyed ()) 962 if (destroyed ())
959 return; 963 return;
960 964
961 if (destroy_inventory) 965 if (destroy_inventory)
962 destroy_inv (false); 966 destroy_inv (false);
967
968 if (is_head ())
969 if (sound_destroy)
970 play_sound (sound_destroy);
971 else if (flag [FLAG_MONSTER])
972 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963 973
964 attachable::destroy (); 974 attachable::destroy ();
965} 975}
966 976
967/* 977/*
… …
1082 if (map->in_memory == MAP_SAVING) 1092 if (map->in_memory == MAP_SAVING)
1083 return; 1093 return;
1084 1094
1085 int check_walk_off = !flag [FLAG_NO_APPLY]; 1095 int check_walk_off = !flag [FLAG_NO_APPLY];
1086 1096
1097 if (object *pl = ms.player ())
1098 {
1099 if (pl->container == this)
1100 /* If a container that the player is currently using somehow gets
1101 * removed (most likely destroyed), update the player view
1102 * appropriately.
1103 */
1104 pl->close_container ();
1105
1106 pl->contr->ns->floorbox_update ();
1107 }
1108
1087 for (tmp = ms.bot; tmp; tmp = tmp->above) 1109 for (tmp = ms.bot; tmp; tmp = tmp->above)
1088 { 1110 {
1089 /* No point updating the players look faces if he is the object 1111 /* No point updating the players look faces if he is the object
1090 * being removed. 1112 * being removed.
1091 */ 1113 */
1092
1093 if (tmp->type == PLAYER && tmp != this)
1094 {
1095 /* If a container that the player is currently using somehow gets
1096 * removed (most likely destroyed), update the player view
1097 * appropriately.
1098 */
1099 if (tmp->container == this)
1100 {
1101 flag [FLAG_APPLIED] = 0;
1102 tmp->container = 0;
1103 }
1104
1105 if (tmp->contr->ns)
1106 tmp->contr->ns->floorbox_update ();
1107 }
1108 1114
1109 /* See if object moving off should effect something */ 1115 /* See if object moving off should effect something */
1110 if (check_walk_off 1116 if (check_walk_off
1111 && ((move_type & tmp->move_off) 1117 && ((move_type & tmp->move_off)
1112 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1115 1121
1116 if (destroyed ()) 1122 if (destroyed ())
1117 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1123 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118 } 1124 }
1119 1125
1120 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1121 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1122 if (tmp->above == tmp)
1123 tmp->above = 0;
1124
1125 last = tmp; 1126 last = tmp;
1126 } 1127 }
1127 1128
1128 /* last == NULL if there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object? 1130 //TODO: this makes little sense, why only update the topmost object?
… …
1149merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1150{ 1151{
1151 if (!op->nrof) 1152 if (!op->nrof)
1152 return 0; 1153 return 0;
1153 1154
1154 if (top) 1155 if (!top)
1155 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1156 ; 1157 ;
1157 1158
1158 for (; top; top = top->below) 1159 for (; top; top = top->below)
1159 { 1160 {
… …
1180 if (more) 1181 if (more)
1181 return; 1182 return;
1182 1183
1183 object *prev = this; 1184 object *prev = this;
1184 1185
1185 for (archetype *at = arch->more; at; at = at->more) 1186 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 { 1187 {
1187 object *op = arch_to_object (at); 1188 object *op = arch_to_object (at);
1188 1189
1189 op->name = name; 1190 op->name = name;
1190 op->name_pl = name_pl; 1191 op->name_pl = name_pl;
… …
1204object * 1205object *
1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1206{ 1207{
1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208 { 1209 {
1209 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->x;
1210 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->y;
1211 } 1212 }
1212 1213
1213 return insert_ob_in_map (op, m, originator, flag); 1214 return insert_ob_in_map (op, m, originator, flag);
1214} 1215}
1215 1216
… …
1240 1241
1241 object *top, *floor = NULL; 1242 object *top, *floor = NULL;
1242 1243
1243 op->remove (); 1244 op->remove ();
1244 1245
1245#if 0
1246 if (!m->active != !op->active)
1247 if (m->active)
1248 op->activate_recursive ();
1249 else
1250 op->deactivate_recursive ();
1251#endif
1252
1253 if (out_of_map (m, op->x, op->y))
1254 {
1255 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1256#ifdef MANY_CORES
1257 /* Better to catch this here, as otherwise the next use of this object
1258 * is likely to cause a crash. Better to find out where it is getting
1259 * improperly inserted.
1260 */
1261 abort ();
1262#endif
1263 return op;
1264 }
1265
1266 if (object *more = op->more)
1267 if (!insert_ob_in_map (more, m, originator, flag))
1268 return 0;
1269
1270 CLEAR_FLAG (op, FLAG_REMOVED);
1271
1272 /* Ideally, the caller figures this out. However, it complicates a lot 1246 /* Ideally, the caller figures this out. However, it complicates a lot
1273 * of areas of callers (eg, anything that uses find_free_spot would now 1247 * of areas of callers (eg, anything that uses find_free_spot would now
1274 * need extra work 1248 * need extra work
1275 */ 1249 */
1276 if (!xy_normalise (m, op->x, op->y)) 1250 if (!xy_normalise (m, op->x, op->y))
1251 {
1252 op->destroy ();
1277 return 0; 1253 return 0;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1278 1261
1279 op->map = m; 1262 op->map = m;
1280 mapspace &ms = op->ms (); 1263 mapspace &ms = op->ms ();
1281 1264
1282 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
… …
1317 else 1300 else
1318 { 1301 {
1319 top = ms.bot; 1302 top = ms.bot;
1320 1303
1321 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1322 if ((!(flag & INS_MAP_LOAD)) && top) 1305 if (top)
1323 { 1306 {
1324 object *last = 0; 1307 object *last = 0;
1325 1308
1326 /* 1309 /*
1327 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
… …
1380 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1381 top = last->below; 1364 top = last->below;
1382 } 1365 }
1383 } /* If objects on this space */ 1366 } /* If objects on this space */
1384 1367
1385 if (flag & INS_MAP_LOAD)
1386 top = ms.top;
1387
1388 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1389 top = floor; 1369 top = floor;
1390 1370
1391 /* Top is the object that our object (op) is going to get inserted above. 1371 /* Top is the object that our object (op) is going to get inserted above.
1392 */ 1372 */
… …
1424 op->map->touch (); 1404 op->map->touch ();
1425 } 1405 }
1426 1406
1427 op->map->dirty = true; 1407 op->map->dirty = true;
1428 1408
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 ()) 1409 if (object *pl = ms.player ())
1434 if (pl->contr->ns)
1435 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1436 1411
1437 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1413 * 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 1414 * 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 1415 * on the map will get recalculated. The players could very well
… …
1487 object *tmp, *tmp1; 1462 object *tmp, *tmp1;
1488 1463
1489 /* first search for itself and remove any old instances */ 1464 /* first search for itself and remove any old instances */
1490 1465
1491 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1492 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1493 tmp->destroy (); 1468 tmp->destroy ();
1494 1469
1495 tmp1 = arch_to_object (archetype::find (arch_string)); 1470 tmp1 = arch_to_object (archetype::find (arch_string));
1496 1471
1497 tmp1->x = op->x; 1472 tmp1->x = op->x;
… …
1678 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1679 */ 1654 */
1680object * 1655object *
1681object::insert (object *op) 1656object::insert (object *op)
1682{ 1657{
1683 object *tmp, *otmp;
1684
1685 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1686 op->remove (); 1659 op->remove ();
1687 1660
1688 if (op->more) 1661 if (op->more)
1689 { 1662 {
… …
1691 return op; 1664 return op;
1692 } 1665 }
1693 1666
1694 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1695 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1696 if (op->nrof) 1670 if (op->nrof)
1697 { 1671 {
1698 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1699 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1700 { 1674 {
1701 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1702 (client needs the original object) */ 1676 (client needs the original object) */
1703 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
… …
1722 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1723 } 1697 }
1724 else 1698 else
1725 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1726 1700
1727 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1728 if (otmp && otmp->contr)
1729 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1730 otmp->update_stats (); 1703 otmp->update_stats ();
1731 1704
1705 op->owner = 0; // its his/hers now. period.
1732 op->map = 0; 1706 op->map = 0;
1733 op->env = this; 1707 op->env = this;
1734 op->above = 0; 1708 op->above = 0;
1735 op->below = 0; 1709 op->below = 0;
1736 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1737 1711
1738 /* reset the light list and los of the players on the map */ 1712 /* reset the light list and los of the players on the map */
1739 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1740 { 1714 {
1741#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1742 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1743#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1744 if (map->darkness) 1718 if (map->darkness)
… …
2024 * customized, changed states, etc. 1998 * customized, changed states, etc.
2025 */ 1999 */
2026int 2000int
2027find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2001find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2028{ 2002{
2003 int altern[SIZEOFFREE];
2029 int index = 0, flag; 2004 int index = 0, flag;
2030 int altern[SIZEOFFREE];
2031 2005
2032 for (int i = start; i < stop; i++) 2006 for (int i = start; i < stop; i++)
2033 { 2007 {
2034 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2008 mapxy pos (m, x, y); pos.move (i);
2035 if (!flag) 2009
2010 if (!pos.normalise ())
2011 continue;
2012
2013 mapspace &ms = *pos;
2014
2015 if (ms.flags () & P_IS_ALIVE)
2016 continue;
2017
2018 /* However, often
2019 * ob doesn't have any move type (when used to place exits)
2020 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2021 */
2022 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2023 {
2036 altern [index++] = i; 2024 altern [index++] = i;
2025 continue;
2026 }
2037 2027
2038 /* Basically, if we find a wall on a space, we cut down the search size. 2028 /* 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. 2029 * 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 - 2030 * 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 2031 * 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 2032 * spaces in all the other directions, this will reduce the search space
2043 * to only the spaces immediately surrounding the target area, and 2033 * to only the spaces immediately surrounding the target area, and
2044 * won't look 2 spaces south of the target space. 2034 * won't look 2 spaces south of the target space.
2045 */ 2035 */
2046 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2036 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2037 {
2047 stop = maxfree[i]; 2038 stop = maxfree[i];
2039 continue;
2040 }
2041
2042 /* Note it is intentional that we check ob - the movement type of the
2043 * head of the object should correspond for the entire object.
2044 */
2045 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2046 continue;
2047
2048 altern [index++] = i;
2048 } 2049 }
2049 2050
2050 if (!index) 2051 if (!index)
2051 return -1; 2052 return -1;
2052 2053
… …
2061 */ 2062 */
2062int 2063int
2063find_first_free_spot (const object *ob, maptile *m, int x, int y) 2064find_first_free_spot (const object *ob, maptile *m, int x, int y)
2064{ 2065{
2065 for (int i = 0; i < SIZEOFFREE; i++) 2066 for (int i = 0; i < SIZEOFFREE; i++)
2066 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2067 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2067 return i; 2068 return i;
2068 2069
2069 return -1; 2070 return -1;
2070} 2071}
2071 2072
… …
2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2349 * core dumps if they do. 2350 * core dumps if they do.
2350 * 2351 *
2351 * Add a check so we can't pick up invisible objects (0.93.8) 2352 * Add a check so we can't pick up invisible objects (0.93.8)
2352 */ 2353 */
2353
2354int 2354int
2355can_pick (const object *who, const object *item) 2355can_pick (const object *who, const object *item)
2356{ 2356{
2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2494 /* Basically, if the archetype has this key set, 2494 /* Basically, if the archetype has this key set,
2495 * we need to store the null value so when we save 2495 * we need to store the null value so when we save
2496 * it, we save the empty value so that when we load, 2496 * it, we save the empty value so that when we load,
2497 * we get this value back again. 2497 * we get this value back again.
2498 */ 2498 */
2499 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2499 if (get_ob_key_link (op->arch, canonical_key))
2500 field->value = 0; 2500 field->value = 0;
2501 else 2501 else
2502 { 2502 {
2503 if (last) 2503 if (last)
2504 last->next = field->next; 2504 last->next = field->next;
… …
2573 } 2573 }
2574 else 2574 else
2575 item = item->env; 2575 item = item->env;
2576} 2576}
2577 2577
2578
2579const char * 2578const char *
2580object::flag_desc (char *desc, int len) const 2579object::flag_desc (char *desc, int len) const
2581{ 2580{
2582 char *p = desc; 2581 char *p = desc;
2583 bool first = true; 2582 bool first = true;
… …
2617 &name, 2616 &name,
2618 title ? "\",title:\"" : "", 2617 title ? "\",title:\"" : "",
2619 title ? (const char *)title : "", 2618 title ? (const char *)title : "",
2620 flag_desc (flagdesc, 512), type); 2619 flag_desc (flagdesc, 512), type);
2621 2620
2622 if (env) 2621 if (!this->flag[FLAG_REMOVED] && env)
2623 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2622 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624 2623
2625 if (map) 2624 if (map)
2626 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2625 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2627 2626
… …
2645} 2644}
2646 2645
2647const materialtype_t * 2646const materialtype_t *
2648object::dominant_material () const 2647object::dominant_material () const
2649{ 2648{
2650 if (materialtype_t *mat = name_to_material (materialname)) 2649 if (materialtype_t *mt = name_to_material (materialname))
2651 return mat; 2650 return mt;
2652 2651
2653 // omfg this is slow, this has to be temporary :)
2654 shstr unknown ("unknown");
2655
2656 return name_to_material (unknown); 2652 return name_to_material (shstr_unknown);
2657} 2653}
2658 2654
2659void 2655void
2660object::open_container (object *new_container) 2656object::open_container (object *new_container)
2661{ 2657{
… …
2677 old_container->flag [FLAG_APPLIED] = 0; 2673 old_container->flag [FLAG_APPLIED] = 0;
2678 container = 0; 2674 container = 0;
2679 2675
2680 esrv_update_item (UPD_FLAGS, this, old_container); 2676 esrv_update_item (UPD_FLAGS, this, old_container);
2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2678 play_sound (sound_find ("chest_close"));
2682 } 2679 }
2683 2680
2684 if (new_container) 2681 if (new_container)
2685 { 2682 {
2686 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2683 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2702 new_container->flag [FLAG_APPLIED] = 1; 2699 new_container->flag [FLAG_APPLIED] = 1;
2703 container = new_container; 2700 container = new_container;
2704 2701
2705 esrv_update_item (UPD_FLAGS, this, new_container); 2702 esrv_update_item (UPD_FLAGS, this, new_container);
2706 esrv_send_inventory (this, new_container); 2703 esrv_send_inventory (this, new_container);
2704 play_sound (sound_find ("chest_open"));
2705 }
2706}
2707
2708object *
2709object::force_find (const shstr name)
2710{
2711 /* cycle through his inventory to look for the MARK we want to
2712 * place
2713 */
2714 for (object *tmp = inv; tmp; tmp = tmp->below)
2715 if (tmp->type == FORCE && tmp->slaying == name)
2716 return splay (tmp);
2717
2718 return 0;
2719}
2720
2721void
2722object::force_add (const shstr name, int duration)
2723{
2724 if (object *force = force_find (name))
2725 force->destroy ();
2726
2727 object *force = get_archetype (FORCE_NAME);
2728
2729 force->slaying = name;
2730 force->stats.food = 1;
2731 force->speed_left = -1.f;
2732
2733 force->set_speed (duration ? 1.f / duration : 0.f);
2734 force->flag [FLAG_IS_USED_UP] = true;
2735 force->flag [FLAG_APPLIED] = true;
2736
2737 insert (force);
2738}
2739
2740void
2741object::play_sound (faceidx sound) const
2742{
2743 if (!sound)
2744 return;
2745
2746 if (flag [FLAG_REMOVED])
2747 return;
2748
2749 if (env)
2707 } 2750 {
2751 if (object *pl = in_player ())
2752 pl->contr->play_sound (sound);
2753 }
2754 else
2755 map->play_sound (sound, x, y);
2708} 2756}
2709 2757
2710

Diff Legend

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