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.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.182 by root, Mon Aug 20 18:11:02 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 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. */
… …
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
… …
299 return 0; 299 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 301 return 0;
302 } 302 }
303 303
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
306 { 305 {
307 ob1->optimise (); 306 ob1->optimise ();
308 ob2->optimise (); 307 ob2->optimise ();
309 308
310 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 311 return 0;
312 } 312 }
313 313
314 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
315 return 1; 315 return 1;
316} 316}
… …
324sum_weight (object *op) 324sum_weight (object *op)
325{ 325{
326 long sum; 326 long sum;
327 object *inv; 327 object *inv;
328 328
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 330 {
331 if (inv->inv) 331 if (inv->inv)
332 sum_weight (inv); 332 sum_weight (inv);
333
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 335 }
335 336
336 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
… …
446 */ 447 */
447 while (owner->owner) 448 while (owner->owner)
448 owner = owner->owner; 449 owner = owner->owner;
449 450
450 this->owner = owner; 451 this->owner = owner;
452}
453
454int
455object::slottype () const
456{
457 if (type == SKILL)
458 {
459 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
460 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
461 }
462 else
463 {
464 if (slot [body_combat].info) return slot_combat;
465 if (slot [body_range ].info) return slot_ranged;
466 }
467
468 return slot_none;
469}
470
471bool
472object::change_weapon (object *ob)
473{
474 if (current_weapon == ob)
475 return true;
476
477 if (chosen_skill)
478 chosen_skill->flag [FLAG_APPLIED] = false;
479
480 current_weapon = ob;
481 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
482
483 if (chosen_skill)
484 chosen_skill->flag [FLAG_APPLIED] = true;
485
486 update_stats ();
487
488 if (ob)
489 {
490 // now check wether any body locations became invalid, in which case
491 // we cannot apply the weapon at the moment.
492 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
493 if (slot[i].used < 0)
494 {
495 current_weapon = chosen_skill = 0;
496 update_stats ();
497
498 new_draw_info_format (NDI_UNIQUE, 0, this,
499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "[You need to unapply some items first.]", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
451} 518}
452 519
453/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 521 * refcounts and freeing the links.
455 */ 522 */
… …
537 * need for monsters, but doesn't hurt to do it for everything. 604 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting 605 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created 606 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped. 607 * for it, they can be properly equipped.
541 */ 608 */
542 memcpy (body_used, body_info, sizeof (body_used)); 609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
543 611
544 attachable::instantiate (); 612 attachable::instantiate ();
545} 613}
546 614
547object * 615object *
… …
835 903
836 if (flag [FLAG_IS_LINKED]) 904 if (flag [FLAG_IS_LINKED])
837 remove_button_link (this); 905 remove_button_link (this);
838 906
839 if (flag [FLAG_FRIENDLY]) 907 if (flag [FLAG_FRIENDLY])
840 {
841 remove_friendly_object (this); 908 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
849 909
850 if (!flag [FLAG_REMOVED]) 910 if (!flag [FLAG_REMOVED])
851 remove (); 911 remove ();
852 912
853 destroy_inv (true); 913 destroy_inv (true);
… …
876 map = freed_map; 936 map = freed_map;
877 x = 1; 937 x = 1;
878 y = 1; 938 y = 1;
879 } 939 }
880 940
881 head = 0;
882
883 if (more) 941 if (more)
884 { 942 {
885 more->destroy (); 943 more->destroy ();
886 more = 0; 944 more = 0;
887 } 945 }
888 946
947 head = 0;
948
889 // clear those pointers that likely might have circular references to us 949 // clear those pointers that likely might cause circular references
890 owner = 0; 950 owner = 0;
891 enemy = 0; 951 enemy = 0;
892 attacked_by = 0; 952 attacked_by = 0;
953 current_weapon = 0;
893} 954}
894 955
895void 956void
896object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
897{ 958{
898 if (destroyed ()) 959 if (destroyed ())
899 return; 960 return;
900 961
901 if (destroy_inventory) 962 if (destroy_inventory)
902 destroy_inv (false); 963 destroy_inv (false);
964
965 if (is_head ())
966 if (sound_destroy)
967 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
903 970
904 attachable::destroy (); 971 attachable::destroy ();
905} 972}
906 973
907/* 974/*
… …
1022 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
1023 return; 1090 return;
1024 1091
1025 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
1026 1093
1094 if (object *pl = ms.player ())
1095 {
1096 if (pl->container == this)
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 pl->close_container ();
1102
1103 pl->contr->ns->floorbox_update ();
1104 }
1105
1027 for (tmp = ms.bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
1028 { 1107 {
1029 /* No point updating the players look faces if he is the object 1108 /* No point updating the players look faces if he is the object
1030 * being removed. 1109 * being removed.
1031 */ 1110 */
1032
1033 if (tmp->type == PLAYER && tmp != this)
1034 {
1035 /* If a container that the player is currently using somehow gets
1036 * removed (most likely destroyed), update the player view
1037 * appropriately.
1038 */
1039 if (tmp->container == this)
1040 {
1041 flag [FLAG_APPLIED] = 0;
1042 tmp->container = 0;
1043 }
1044
1045 if (tmp->contr->ns)
1046 tmp->contr->ns->floorbox_update ();
1047 }
1048 1111
1049 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1050 if (check_walk_off 1113 if (check_walk_off
1051 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1052 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1055 1118
1056 if (destroyed ()) 1119 if (destroyed ())
1057 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1058 } 1121 }
1059 1122
1060 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1061 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1062 if (tmp->above == tmp)
1063 tmp->above = 0;
1064
1065 last = tmp; 1123 last = tmp;
1066 } 1124 }
1067 1125
1068 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1069 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
… …
1120 if (more) 1178 if (more)
1121 return; 1179 return;
1122 1180
1123 object *prev = this; 1181 object *prev = this;
1124 1182
1125 for (archetype *at = arch->more; at; at = at->more) 1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1126 { 1184 {
1127 object *op = arch_to_object (at); 1185 object *op = arch_to_object (at);
1128 1186
1129 op->name = name; 1187 op->name = name;
1130 op->name_pl = name_pl; 1188 op->name_pl = name_pl;
… …
1144object * 1202object *
1145insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1146{ 1204{
1147 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1148 { 1206 {
1149 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1150 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1151 } 1209 }
1152 1210
1153 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1154} 1212}
1155 1213
… …
1176object * 1234object *
1177insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1178{ 1236{
1179 assert (!op->flag [FLAG_FREED]); 1237 assert (!op->flag [FLAG_FREED]);
1180 1238
1181 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1182 1240
1183 op->remove (); 1241 op->remove ();
1184
1185#if 0
1186 if (!m->active != !op->active)
1187 if (m->active)
1188 op->activate_recursive ();
1189 else
1190 op->deactivate_recursive ();
1191#endif
1192 1242
1193 if (out_of_map (m, op->x, op->y)) 1243 if (out_of_map (m, op->x, op->y))
1194 { 1244 {
1195 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1196#ifdef MANY_CORES 1246#ifdef MANY_CORES
… …
1202#endif 1252#endif
1203 return op; 1253 return op;
1204 } 1254 }
1205 1255
1206 if (object *more = op->more) 1256 if (object *more = op->more)
1207 {
1208 if (!insert_ob_in_map (more, m, originator, flag)) 1257 if (!insert_ob_in_map (more, m, originator, flag))
1209 {
1210 if (!op->head)
1211 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1212
1213 return 0; 1258 return 0;
1214 }
1215 }
1216 1259
1217 CLEAR_FLAG (op, FLAG_REMOVED); 1260 CLEAR_FLAG (op, FLAG_REMOVED);
1218 1261
1219 /* Ideally, the caller figures this out. However, it complicates a lot 1262 /* Ideally, the caller figures this out. However, it complicates a lot
1220 * of areas of callers (eg, anything that uses find_free_spot would now 1263 * of areas of callers (eg, anything that uses find_free_spot would now
… …
1227 mapspace &ms = op->ms (); 1270 mapspace &ms = op->ms ();
1228 1271
1229 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
1230 */ 1273 */
1231 if (op->nrof && !(flag & INS_NO_MERGE)) 1274 if (op->nrof && !(flag & INS_NO_MERGE))
1232 for (tmp = ms.bot; tmp; tmp = tmp->above) 1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1233 if (object::can_merge (op, tmp)) 1276 if (object::can_merge (op, tmp))
1234 { 1277 {
1235 op->nrof += tmp->nrof; 1278 op->nrof += tmp->nrof;
1236 tmp->destroy (); 1279 tmp->destroy ();
1237 } 1280 }
… …
1326 */ 1369 */
1327 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1328 top = last->below; 1371 top = last->below;
1329 } 1372 }
1330 } /* If objects on this space */ 1373 } /* If objects on this space */
1331
1332 if (flag & INS_MAP_LOAD) 1374 if (flag & INS_MAP_LOAD)
1333 top = ms.top; 1375 top = ms.top;
1334 1376
1335 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1336 top = floor; 1378 top = floor;
… …
1371 op->map->touch (); 1413 op->map->touch ();
1372 } 1414 }
1373 1415
1374 op->map->dirty = true; 1416 op->map->dirty = true;
1375 1417
1376 /* If we have a floor, we know the player, if any, will be above
1377 * it, so save a few ticks and start from there.
1378 */
1379 if (!(flag & INS_MAP_LOAD)) 1418 if (!(flag & INS_MAP_LOAD))
1380 if (object *pl = ms.player ()) 1419 if (object *pl = ms.player ())
1381 if (pl->contr->ns)
1382 pl->contr->ns->floorbox_update (); 1420 pl->contr->ns->floorbox_update ();
1383 1421
1384 /* If this object glows, it may affect lighting conditions that are 1422 /* If this object glows, it may affect lighting conditions that are
1385 * visible to others on this map. But update_all_los is really 1423 * visible to others on this map. But update_all_los is really
1386 * an inefficient way to do this, as it means los for all players 1424 * an inefficient way to do this, as it means los for all players
1387 * on the map will get recalculated. The players could very well 1425 * on the map will get recalculated. The players could very well
… …
1406 * blocked() and wall() work properly), and these flags are updated by 1444 * blocked() and wall() work properly), and these flags are updated by
1407 * update_object(). 1445 * update_object().
1408 */ 1446 */
1409 1447
1410 /* if this is not the head or flag has been passed, don't check walk on status */ 1448 /* if this is not the head or flag has been passed, don't check walk on status */
1411 if (!(flag & INS_NO_WALK_ON) && !op->head) 1449 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1412 { 1450 {
1413 if (check_move_on (op, originator)) 1451 if (check_move_on (op, originator))
1414 return 0; 1452 return 0;
1415 1453
1416 /* If we are a multi part object, lets work our way through the check 1454 /* If we are a multi part object, lets work our way through the check
1417 * walk on's. 1455 * walk on's.
1418 */ 1456 */
1419 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1457 for (object *tmp = op->more; tmp; tmp = tmp->more)
1420 if (check_move_on (tmp, originator)) 1458 if (check_move_on (tmp, originator))
1421 return 0; 1459 return 0;
1422 } 1460 }
1423 1461
1424 return op; 1462 return op;
… …
1434 object *tmp, *tmp1; 1472 object *tmp, *tmp1;
1435 1473
1436 /* first search for itself and remove any old instances */ 1474 /* first search for itself and remove any old instances */
1437 1475
1438 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1476 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1477 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1440 tmp->destroy (); 1478 tmp->destroy ();
1441 1479
1442 tmp1 = arch_to_object (archetype::find (arch_string)); 1480 tmp1 = arch_to_object (archetype::find (arch_string));
1443 1481
1444 tmp1->x = op->x; 1482 tmp1->x = op->x;
… …
1605 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1643 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1606 free (dump); 1644 free (dump);
1607 return op; 1645 return op;
1608 } 1646 }
1609 1647
1610 if (where->head) 1648 if (where->head_ () != where)
1611 { 1649 {
1612 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1650 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1613 where = where->head; 1651 where = where->head;
1614 } 1652 }
1615 1653
1616 return where->insert (op); 1654 return where->insert (op);
1617} 1655}
… …
1625 * be != op, if items are merged. -Tero 1663 * be != op, if items are merged. -Tero
1626 */ 1664 */
1627object * 1665object *
1628object::insert (object *op) 1666object::insert (object *op)
1629{ 1667{
1630 object *tmp, *otmp;
1631
1632 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1668 if (!QUERY_FLAG (op, FLAG_REMOVED))
1633 op->remove (); 1669 op->remove ();
1634 1670
1635 if (op->more) 1671 if (op->more)
1636 { 1672 {
… …
1638 return op; 1674 return op;
1639 } 1675 }
1640 1676
1641 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1677 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1642 CLEAR_FLAG (op, FLAG_REMOVED); 1678 CLEAR_FLAG (op, FLAG_REMOVED);
1679
1643 if (op->nrof) 1680 if (op->nrof)
1644 { 1681 {
1645 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1682 for (object *tmp = inv; tmp; tmp = tmp->below)
1646 if (object::can_merge (tmp, op)) 1683 if (object::can_merge (tmp, op))
1647 { 1684 {
1648 /* return the original object and remove inserted object 1685 /* return the original object and remove inserted object
1649 (client needs the original object) */ 1686 (client needs the original object) */
1650 tmp->nrof += op->nrof; 1687 tmp->nrof += op->nrof;
… …
1669 add_weight (this, op->weight * op->nrof); 1706 add_weight (this, op->weight * op->nrof);
1670 } 1707 }
1671 else 1708 else
1672 add_weight (this, (op->weight + op->carrying)); 1709 add_weight (this, (op->weight + op->carrying));
1673 1710
1674 otmp = this->in_player (); 1711 if (object *otmp = this->in_player ())
1675 if (otmp && otmp->contr)
1676 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1712 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1677 otmp->update_stats (); 1713 otmp->update_stats ();
1678 1714
1715 op->owner = 0; // its his/hers now. period.
1679 op->map = 0; 1716 op->map = 0;
1680 op->env = this; 1717 op->env = this;
1681 op->above = 0; 1718 op->above = 0;
1682 op->below = 0; 1719 op->below = 0;
1683 op->x = 0, op->y = 0; 1720 op->x = op->y = 0;
1684 1721
1685 /* reset the light list and los of the players on the map */ 1722 /* reset the light list and los of the players on the map */
1686 if ((op->glow_radius != 0) && map) 1723 if (op->glow_radius && map)
1687 { 1724 {
1688#ifdef DEBUG_LIGHTS 1725#ifdef DEBUG_LIGHTS
1689 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1726 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1690#endif /* DEBUG_LIGHTS */ 1727#endif /* DEBUG_LIGHTS */
1691 if (map->darkness) 1728 if (map->darkness)
… …
1945 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1982 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1946 { 1983 {
1947 CLEAR_FLAG (tmp, flag); 1984 CLEAR_FLAG (tmp, flag);
1948 unflag_inv (tmp, flag); 1985 unflag_inv (tmp, flag);
1949 } 1986 }
1950}
1951
1952/*
1953 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1954 * all it's inventory (recursively).
1955 * If checksums are used, a player will get set_cheat called for
1956 * him/her-self and all object carried by a call to this function.
1957 */
1958void
1959set_cheat (object *op)
1960{
1961 SET_FLAG (op, FLAG_WAS_WIZ);
1962 flag_inv (op, FLAG_WAS_WIZ);
1963} 1987}
1964 1988
1965/* 1989/*
1966 * find_free_spot(object, map, x, y, start, stop) will search for 1990 * find_free_spot(object, map, x, y, start, stop) will search for
1967 * a spot at the given map and coordinates which will be able to contain 1991 * a spot at the given map and coordinates which will be able to contain
… …
2085 object *tmp; 2109 object *tmp;
2086 maptile *mp; 2110 maptile *mp;
2087 2111
2088 MoveType blocked, move_type; 2112 MoveType blocked, move_type;
2089 2113
2090 if (exclude && exclude->head) 2114 if (exclude && exclude->head_ () != exclude)
2091 { 2115 {
2092 exclude = exclude->head; 2116 exclude = exclude->head;
2093 move_type = exclude->move_type; 2117 move_type = exclude->move_type;
2094 } 2118 }
2095 else 2119 else
… …
2118 max = maxfree[i]; 2142 max = maxfree[i];
2119 else if (mflags & P_IS_ALIVE) 2143 else if (mflags & P_IS_ALIVE)
2120 { 2144 {
2121 for (tmp = ms.bot; tmp; tmp = tmp->above) 2145 for (tmp = ms.bot; tmp; tmp = tmp->above)
2122 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2146 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2123 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2147 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2124 break; 2148 break;
2125 2149
2126 if (tmp) 2150 if (tmp)
2127 return freedir[i]; 2151 return freedir[i];
2128 } 2152 }
… …
2308 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2332 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2309 * core dumps if they do. 2333 * core dumps if they do.
2310 * 2334 *
2311 * Add a check so we can't pick up invisible objects (0.93.8) 2335 * Add a check so we can't pick up invisible objects (0.93.8)
2312 */ 2336 */
2313
2314int 2337int
2315can_pick (const object *who, const object *item) 2338can_pick (const object *who, const object *item)
2316{ 2339{
2317 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2340 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2318 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2341 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2323 * create clone from object to another 2346 * create clone from object to another
2324 */ 2347 */
2325object * 2348object *
2326object_create_clone (object *asrc) 2349object_create_clone (object *asrc)
2327{ 2350{
2328 object *dst = 0, *tmp, *src, *part, *prev, *item; 2351 object *dst = 0, *tmp, *src, *prev, *item;
2329 2352
2330 if (!asrc) 2353 if (!asrc)
2331 return 0; 2354 return 0;
2332 2355
2333 src = asrc;
2334 if (src->head)
2335 src = src->head; 2356 src = asrc->head_ ();
2336 2357
2337 prev = 0; 2358 prev = 0;
2338 for (part = src; part; part = part->more) 2359 for (object *part = src; part; part = part->more)
2339 { 2360 {
2340 tmp = part->clone (); 2361 tmp = part->clone ();
2341 tmp->x -= src->x; 2362 tmp->x -= src->x;
2342 tmp->y -= src->y; 2363 tmp->y -= src->y;
2343 2364
… …
2456 /* Basically, if the archetype has this key set, 2477 /* Basically, if the archetype has this key set,
2457 * we need to store the null value so when we save 2478 * we need to store the null value so when we save
2458 * it, we save the empty value so that when we load, 2479 * it, we save the empty value so that when we load,
2459 * we get this value back again. 2480 * we get this value back again.
2460 */ 2481 */
2461 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2482 if (get_ob_key_link (op->arch, canonical_key))
2462 field->value = 0; 2483 field->value = 0;
2463 else 2484 else
2464 { 2485 {
2465 if (last) 2486 if (last)
2466 last->next = field->next; 2487 last->next = field->next;
… …
2535 } 2556 }
2536 else 2557 else
2537 item = item->env; 2558 item = item->env;
2538} 2559}
2539 2560
2540
2541const char * 2561const char *
2542object::flag_desc (char *desc, int len) const 2562object::flag_desc (char *desc, int len) const
2543{ 2563{
2544 char *p = desc; 2564 char *p = desc;
2545 bool first = true; 2565 bool first = true;
… …
2579 &name, 2599 &name,
2580 title ? "\",title:\"" : "", 2600 title ? "\",title:\"" : "",
2581 title ? (const char *)title : "", 2601 title ? (const char *)title : "",
2582 flag_desc (flagdesc, 512), type); 2602 flag_desc (flagdesc, 512), type);
2583 2603
2584 if (env) 2604 if (!this->flag[FLAG_REMOVED] && env)
2585 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2605 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2586 2606
2587 if (map) 2607 if (map)
2588 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2608 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2589 2609
… …
2591} 2611}
2592 2612
2593const char * 2613const char *
2594object::debug_desc () const 2614object::debug_desc () const
2595{ 2615{
2596 static char info[256 * 4]; 2616 static char info[3][256 * 4];
2617 static int info_idx;
2618
2597 return debug_desc (info); 2619 return debug_desc (info [++info_idx % 3]);
2598}
2599
2600const char *
2601object::debug_desc2 () const
2602{
2603 static char info[256 * 4];
2604 return debug_desc (info);
2605} 2620}
2606 2621
2607struct region * 2622struct region *
2608object::region () const 2623object::region () const
2609{ 2624{
… …
2612} 2627}
2613 2628
2614const materialtype_t * 2629const materialtype_t *
2615object::dominant_material () const 2630object::dominant_material () const
2616{ 2631{
2617 if (materialtype_t *mat = name_to_material (materialname)) 2632 if (materialtype_t *mt = name_to_material (materialname))
2618 return mat; 2633 return mt;
2619 2634
2620 // omfg this is slow, this has to be temporary :)
2621 shstr unknown ("unknown");
2622
2623 return name_to_material (unknown); 2635 return name_to_material (shstr_unknown);
2624} 2636}
2625 2637
2626void 2638void
2627object::open_container (object *new_container) 2639object::open_container (object *new_container)
2628{ 2640{
… …
2644 old_container->flag [FLAG_APPLIED] = 0; 2656 old_container->flag [FLAG_APPLIED] = 0;
2645 container = 0; 2657 container = 0;
2646 2658
2647 esrv_update_item (UPD_FLAGS, this, old_container); 2659 esrv_update_item (UPD_FLAGS, this, old_container);
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2660 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2661 play_sound (sound_find ("chest_close"));
2649 } 2662 }
2650 2663
2651 if (new_container) 2664 if (new_container)
2652 { 2665 {
2653 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2666 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2669 new_container->flag [FLAG_APPLIED] = 1; 2682 new_container->flag [FLAG_APPLIED] = 1;
2670 container = new_container; 2683 container = new_container;
2671 2684
2672 esrv_update_item (UPD_FLAGS, this, new_container); 2685 esrv_update_item (UPD_FLAGS, this, new_container);
2673 esrv_send_inventory (this, new_container); 2686 esrv_send_inventory (this, new_container);
2687 play_sound (sound_find ("chest_open"));
2688 }
2689}
2690
2691object *
2692object::force_find (const shstr name)
2693{
2694 /* cycle through his inventory to look for the MARK we want to
2695 * place
2696 */
2697 for (object *tmp = inv; tmp; tmp = tmp->below)
2698 if (tmp->type == FORCE && tmp->slaying == name)
2699 return splay (tmp);
2700
2701 return 0;
2702}
2703
2704void
2705object::force_add (const shstr name, int duration)
2706{
2707 if (object *force = force_find (name))
2708 force->destroy ();
2709
2710 object *force = get_archetype (FORCE_NAME);
2711
2712 force->slaying = name;
2713 force->stats.food = 1;
2714 force->speed_left = -1.f;
2715
2716 force->set_speed (duration ? 1.f / duration : 0.f);
2717 force->flag [FLAG_IS_USED_UP] = true;
2718 force->flag [FLAG_APPLIED] = true;
2719
2720 insert (force);
2721}
2722
2723void
2724object::play_sound (faceidx sound) const
2725{
2726 if (!sound)
2727 return;
2728
2729 if (flag [FLAG_REMOVED])
2730 return;
2731
2732 if (env)
2674 } 2733 {
2734 if (object *pl = in_player ())
2735 pl->contr->play_sound (sound);
2736 }
2737 else
2738 map->play_sound (sound, x, y);
2675} 2739}
2676 2740
2677

Diff Legend

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