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.145 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 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. */
… …
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}
… …
374/* 374/*
375 * 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
376 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
378 */ 378 */
379
380object * 379object *
381get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
382{ 381{
383 object *tmp, *closest; 382 object *tmp, *closest;
384 int last_dist, i; 383 int last_dist, i;
… …
429} 428}
430 429
431/* 430/*
432 * 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
433 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
434 */ 434 */
435void 435void
436object::set_owner (object *owner) 436object::set_owner (object *owner)
437{ 437{
438 // allow objects which own objects
438 if (!owner) 439 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) 440 while (owner->owner)
449 owner = owner->owner; 441 owner = owner->owner;
450 442
451 this->owner = owner; 443 this->owner = owner;
452} 444}
453 445
454void 446int
447object::slottype () const
448{
449 if (type == SKILL)
450 {
451 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
452 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
453 }
454 else
455 {
456 if (slot [body_combat].info) return slot_combat;
457 if (slot [body_range ].info) return slot_ranged;
458 }
459
460 return slot_none;
461}
462
463bool
455object::set_weapon (object *ob) 464object::change_weapon (object *ob)
456{ 465{
457 if (current_weapon == ob) 466 if (current_weapon == ob)
458 return; 467 return true;
468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = false;
459 471
460 current_weapon = ob; 472 current_weapon = ob;
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 473 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
474
475 if (chosen_skill)
476 chosen_skill->flag [FLAG_APPLIED] = true;
477
462 update_stats (); 478 update_stats ();
479
480 if (ob)
481 {
482 // now check wether any body locations became invalid, in which case
483 // we cannot apply the weapon at the moment.
484 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
485 if (slot[i].used < 0)
486 {
487 current_weapon = chosen_skill = 0;
488 update_stats ();
489
490 new_draw_info_format (NDI_UNIQUE, 0, this,
491 "You try to balance all your items at once, "
492 "but the %s is just too much for your body. "
493 "[You need to unapply some items first.]", &ob->name);
494 return false;
495 }
496
497 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
498 }
499 else
500 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
501
502 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
503 {
504 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
505 &name, ob->debug_desc ());
506 return false;
507 }
508
509 return true;
463} 510}
464 511
465/* Zero the key_values on op, decrementing the shared-string 512/* Zero the key_values on op, decrementing the shared-string
466 * refcounts and freeing the links. 513 * refcounts and freeing the links.
467 */ 514 */
… …
531object::copy_to (object *dst) 578object::copy_to (object *dst)
532{ 579{
533 *dst = *this; 580 *dst = *this;
534 581
535 if (speed < 0) 582 if (speed < 0)
536 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
537 584
538 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
539} 586}
540 587
541void 588void
… …
881 map = freed_map; 928 map = freed_map;
882 x = 1; 929 x = 1;
883 y = 1; 930 y = 1;
884 } 931 }
885 932
886 head = 0;
887
888 if (more) 933 if (more)
889 { 934 {
890 more->destroy (); 935 more->destroy ();
891 more = 0; 936 more = 0;
892 } 937 }
893 938
939 head = 0;
940
894 // clear those pointers that likely might have circular references to us 941 // clear those pointers that likely might cause circular references
895 owner = 0; 942 owner = 0;
896 enemy = 0; 943 enemy = 0;
897 attacked_by = 0; 944 attacked_by = 0;
945 current_weapon = 0;
898} 946}
899 947
900void 948void
901object::destroy (bool destroy_inventory) 949object::destroy (bool destroy_inventory)
902{ 950{
903 if (destroyed ()) 951 if (destroyed ())
904 return; 952 return;
905 953
906 if (destroy_inventory) 954 if (destroy_inventory)
907 destroy_inv (false); 955 destroy_inv (false);
956
957 if (is_head ())
958 if (sound_destroy)
959 play_sound (sound_destroy);
960 else if (flag [FLAG_MONSTER])
961 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
908 962
909 attachable::destroy (); 963 attachable::destroy ();
910} 964}
911 965
912/* 966/*
… …
1027 if (map->in_memory == MAP_SAVING) 1081 if (map->in_memory == MAP_SAVING)
1028 return; 1082 return;
1029 1083
1030 int check_walk_off = !flag [FLAG_NO_APPLY]; 1084 int check_walk_off = !flag [FLAG_NO_APPLY];
1031 1085
1086 if (object *pl = ms.player ())
1087 {
1088 if (pl->container == this)
1089 /* If a container that the player is currently using somehow gets
1090 * removed (most likely destroyed), update the player view
1091 * appropriately.
1092 */
1093 pl->close_container ();
1094
1095 pl->contr->ns->floorbox_update ();
1096 }
1097
1032 for (tmp = ms.bot; tmp; tmp = tmp->above) 1098 for (tmp = ms.bot; tmp; tmp = tmp->above)
1033 { 1099 {
1034 /* No point updating the players look faces if he is the object 1100 /* No point updating the players look faces if he is the object
1035 * being removed. 1101 * being removed.
1036 */ 1102 */
1037
1038 if (tmp->type == PLAYER && tmp != this)
1039 {
1040 /* If a container that the player is currently using somehow gets
1041 * removed (most likely destroyed), update the player view
1042 * appropriately.
1043 */
1044 if (tmp->container == this)
1045 {
1046 flag [FLAG_APPLIED] = 0;
1047 tmp->container = 0;
1048 }
1049
1050 if (tmp->contr->ns)
1051 tmp->contr->ns->floorbox_update ();
1052 }
1053 1103
1054 /* See if object moving off should effect something */ 1104 /* See if object moving off should effect something */
1055 if (check_walk_off 1105 if (check_walk_off
1056 && ((move_type & tmp->move_off) 1106 && ((move_type & tmp->move_off)
1057 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1107 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1060 1110
1061 if (destroyed ()) 1111 if (destroyed ())
1062 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1112 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1063 } 1113 }
1064 1114
1065 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1066 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1067 if (tmp->above == tmp)
1068 tmp->above = 0;
1069
1070 last = tmp; 1115 last = tmp;
1071 } 1116 }
1072 1117
1073 /* last == NULL if there are no objects on this space */ 1118 /* last == NULL if there are no objects on this space */
1074 //TODO: this makes little sense, why only update the topmost object? 1119 //TODO: this makes little sense, why only update the topmost object?
… …
1125 if (more) 1170 if (more)
1126 return; 1171 return;
1127 1172
1128 object *prev = this; 1173 object *prev = this;
1129 1174
1130 for (archetype *at = arch->more; at; at = at->more) 1175 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1131 { 1176 {
1132 object *op = arch_to_object (at); 1177 object *op = arch_to_object (at);
1133 1178
1134 op->name = name; 1179 op->name = name;
1135 op->name_pl = name_pl; 1180 op->name_pl = name_pl;
… …
1149object * 1194object *
1150insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1195insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1151{ 1196{
1152 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1197 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1153 { 1198 {
1154 tmp->x = x + tmp->arch->clone.x; 1199 tmp->x = x + tmp->arch->x;
1155 tmp->y = y + tmp->arch->clone.y; 1200 tmp->y = y + tmp->arch->y;
1156 } 1201 }
1157 1202
1158 return insert_ob_in_map (op, m, originator, flag); 1203 return insert_ob_in_map (op, m, originator, flag);
1159} 1204}
1160 1205
… …
1181object * 1226object *
1182insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1227insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1183{ 1228{
1184 assert (!op->flag [FLAG_FREED]); 1229 assert (!op->flag [FLAG_FREED]);
1185 1230
1186 object *tmp, *top, *floor = NULL; 1231 object *top, *floor = NULL;
1187 1232
1188 op->remove (); 1233 op->remove ();
1189
1190#if 0
1191 if (!m->active != !op->active)
1192 if (m->active)
1193 op->activate_recursive ();
1194 else
1195 op->deactivate_recursive ();
1196#endif
1197 1234
1198 if (out_of_map (m, op->x, op->y)) 1235 if (out_of_map (m, op->x, op->y))
1199 { 1236 {
1200 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1237 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1201#ifdef MANY_CORES 1238#ifdef MANY_CORES
… …
1207#endif 1244#endif
1208 return op; 1245 return op;
1209 } 1246 }
1210 1247
1211 if (object *more = op->more) 1248 if (object *more = op->more)
1212 {
1213 if (!insert_ob_in_map (more, m, originator, flag)) 1249 if (!insert_ob_in_map (more, m, originator, flag))
1214 {
1215 if (!op->head)
1216 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218 return 0; 1250 return 0;
1219 }
1220 }
1221 1251
1222 CLEAR_FLAG (op, FLAG_REMOVED); 1252 CLEAR_FLAG (op, FLAG_REMOVED);
1223 1253
1224 /* Ideally, the caller figures this out. However, it complicates a lot 1254 /* Ideally, the caller figures this out. However, it complicates a lot
1225 * of areas of callers (eg, anything that uses find_free_spot would now 1255 * of areas of callers (eg, anything that uses find_free_spot would now
… …
1232 mapspace &ms = op->ms (); 1262 mapspace &ms = op->ms ();
1233 1263
1234 /* this has to be done after we translate the coordinates. 1264 /* this has to be done after we translate the coordinates.
1235 */ 1265 */
1236 if (op->nrof && !(flag & INS_NO_MERGE)) 1266 if (op->nrof && !(flag & INS_NO_MERGE))
1237 for (tmp = ms.bot; tmp; tmp = tmp->above) 1267 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1238 if (object::can_merge (op, tmp)) 1268 if (object::can_merge (op, tmp))
1239 { 1269 {
1240 op->nrof += tmp->nrof; 1270 op->nrof += tmp->nrof;
1241 tmp->destroy (); 1271 tmp->destroy ();
1242 } 1272 }
… …
1331 */ 1361 */
1332 if (last && last->below && last != floor) 1362 if (last && last->below && last != floor)
1333 top = last->below; 1363 top = last->below;
1334 } 1364 }
1335 } /* If objects on this space */ 1365 } /* If objects on this space */
1336
1337 if (flag & INS_MAP_LOAD) 1366 if (flag & INS_MAP_LOAD)
1338 top = ms.top; 1367 top = ms.top;
1339 1368
1340 if (flag & INS_ABOVE_FLOOR_ONLY) 1369 if (flag & INS_ABOVE_FLOOR_ONLY)
1341 top = floor; 1370 top = floor;
… …
1376 op->map->touch (); 1405 op->map->touch ();
1377 } 1406 }
1378 1407
1379 op->map->dirty = true; 1408 op->map->dirty = true;
1380 1409
1381 /* If we have a floor, we know the player, if any, will be above
1382 * it, so save a few ticks and start from there.
1383 */
1384 if (!(flag & INS_MAP_LOAD)) 1410 if (!(flag & INS_MAP_LOAD))
1385 if (object *pl = ms.player ()) 1411 if (object *pl = ms.player ())
1386 if (pl->contr->ns)
1387 pl->contr->ns->floorbox_update (); 1412 pl->contr->ns->floorbox_update ();
1388 1413
1389 /* If this object glows, it may affect lighting conditions that are 1414 /* If this object glows, it may affect lighting conditions that are
1390 * visible to others on this map. But update_all_los is really 1415 * visible to others on this map. But update_all_los is really
1391 * an inefficient way to do this, as it means los for all players 1416 * an inefficient way to do this, as it means los for all players
1392 * on the map will get recalculated. The players could very well 1417 * on the map will get recalculated. The players could very well
… …
1411 * blocked() and wall() work properly), and these flags are updated by 1436 * blocked() and wall() work properly), and these flags are updated by
1412 * update_object(). 1437 * update_object().
1413 */ 1438 */
1414 1439
1415 /* if this is not the head or flag has been passed, don't check walk on status */ 1440 /* if this is not the head or flag has been passed, don't check walk on status */
1416 if (!(flag & INS_NO_WALK_ON) && !op->head) 1441 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1417 { 1442 {
1418 if (check_move_on (op, originator)) 1443 if (check_move_on (op, originator))
1419 return 0; 1444 return 0;
1420 1445
1421 /* If we are a multi part object, lets work our way through the check 1446 /* If we are a multi part object, lets work our way through the check
1422 * walk on's. 1447 * walk on's.
1423 */ 1448 */
1424 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1449 for (object *tmp = op->more; tmp; tmp = tmp->more)
1425 if (check_move_on (tmp, originator)) 1450 if (check_move_on (tmp, originator))
1426 return 0; 1451 return 0;
1427 } 1452 }
1428 1453
1429 return op; 1454 return op;
… …
1439 object *tmp, *tmp1; 1464 object *tmp, *tmp1;
1440 1465
1441 /* first search for itself and remove any old instances */ 1466 /* first search for itself and remove any old instances */
1442 1467
1443 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1468 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1469 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1445 tmp->destroy (); 1470 tmp->destroy ();
1446 1471
1447 tmp1 = arch_to_object (archetype::find (arch_string)); 1472 tmp1 = arch_to_object (archetype::find (arch_string));
1448 1473
1449 tmp1->x = op->x; 1474 tmp1->x = op->x;
… …
1610 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1635 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1611 free (dump); 1636 free (dump);
1612 return op; 1637 return op;
1613 } 1638 }
1614 1639
1615 if (where->head) 1640 if (where->head_ () != where)
1616 { 1641 {
1617 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1642 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618 where = where->head; 1643 where = where->head;
1619 } 1644 }
1620 1645
1621 return where->insert (op); 1646 return where->insert (op);
1622} 1647}
… …
1630 * be != op, if items are merged. -Tero 1655 * be != op, if items are merged. -Tero
1631 */ 1656 */
1632object * 1657object *
1633object::insert (object *op) 1658object::insert (object *op)
1634{ 1659{
1635 object *tmp, *otmp;
1636
1637 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1660 if (!QUERY_FLAG (op, FLAG_REMOVED))
1638 op->remove (); 1661 op->remove ();
1639 1662
1640 if (op->more) 1663 if (op->more)
1641 { 1664 {
… …
1643 return op; 1666 return op;
1644 } 1667 }
1645 1668
1646 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1669 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1647 CLEAR_FLAG (op, FLAG_REMOVED); 1670 CLEAR_FLAG (op, FLAG_REMOVED);
1671
1648 if (op->nrof) 1672 if (op->nrof)
1649 { 1673 {
1650 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1674 for (object *tmp = inv; tmp; tmp = tmp->below)
1651 if (object::can_merge (tmp, op)) 1675 if (object::can_merge (tmp, op))
1652 { 1676 {
1653 /* return the original object and remove inserted object 1677 /* return the original object and remove inserted object
1654 (client needs the original object) */ 1678 (client needs the original object) */
1655 tmp->nrof += op->nrof; 1679 tmp->nrof += op->nrof;
… …
1674 add_weight (this, op->weight * op->nrof); 1698 add_weight (this, op->weight * op->nrof);
1675 } 1699 }
1676 else 1700 else
1677 add_weight (this, (op->weight + op->carrying)); 1701 add_weight (this, (op->weight + op->carrying));
1678 1702
1679 otmp = this->in_player (); 1703 if (object *otmp = this->in_player ())
1680 if (otmp && otmp->contr)
1681 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1704 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1682 otmp->update_stats (); 1705 otmp->update_stats ();
1683 1706
1707 op->owner = 0; // its his/hers now. period.
1684 op->map = 0; 1708 op->map = 0;
1685 op->env = this; 1709 op->env = this;
1686 op->above = 0; 1710 op->above = 0;
1687 op->below = 0; 1711 op->below = 0;
1688 op->x = 0, op->y = 0; 1712 op->x = op->y = 0;
1689 1713
1690 /* reset the light list and los of the players on the map */ 1714 /* reset the light list and los of the players on the map */
1691 if ((op->glow_radius != 0) && map) 1715 if (op->glow_radius && map)
1692 { 1716 {
1693#ifdef DEBUG_LIGHTS 1717#ifdef DEBUG_LIGHTS
1694 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1718 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1695#endif /* DEBUG_LIGHTS */ 1719#endif /* DEBUG_LIGHTS */
1696 if (map->darkness) 1720 if (map->darkness)
… …
1950 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1974 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1951 { 1975 {
1952 CLEAR_FLAG (tmp, flag); 1976 CLEAR_FLAG (tmp, flag);
1953 unflag_inv (tmp, flag); 1977 unflag_inv (tmp, flag);
1954 } 1978 }
1955}
1956
1957/*
1958 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1959 * all it's inventory (recursively).
1960 * If checksums are used, a player will get set_cheat called for
1961 * him/her-self and all object carried by a call to this function.
1962 */
1963void
1964set_cheat (object *op)
1965{
1966 SET_FLAG (op, FLAG_WAS_WIZ);
1967 flag_inv (op, FLAG_WAS_WIZ);
1968} 1979}
1969 1980
1970/* 1981/*
1971 * find_free_spot(object, map, x, y, start, stop) will search for 1982 * find_free_spot(object, map, x, y, start, stop) will search for
1972 * a spot at the given map and coordinates which will be able to contain 1983 * a spot at the given map and coordinates which will be able to contain
… …
2090 object *tmp; 2101 object *tmp;
2091 maptile *mp; 2102 maptile *mp;
2092 2103
2093 MoveType blocked, move_type; 2104 MoveType blocked, move_type;
2094 2105
2095 if (exclude && exclude->head) 2106 if (exclude && exclude->head_ () != exclude)
2096 { 2107 {
2097 exclude = exclude->head; 2108 exclude = exclude->head;
2098 move_type = exclude->move_type; 2109 move_type = exclude->move_type;
2099 } 2110 }
2100 else 2111 else
… …
2123 max = maxfree[i]; 2134 max = maxfree[i];
2124 else if (mflags & P_IS_ALIVE) 2135 else if (mflags & P_IS_ALIVE)
2125 { 2136 {
2126 for (tmp = ms.bot; tmp; tmp = tmp->above) 2137 for (tmp = ms.bot; tmp; tmp = tmp->above)
2127 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2138 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2128 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2139 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2129 break; 2140 break;
2130 2141
2131 if (tmp) 2142 if (tmp)
2132 return freedir[i]; 2143 return freedir[i];
2133 } 2144 }
… …
2313 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2324 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2314 * core dumps if they do. 2325 * core dumps if they do.
2315 * 2326 *
2316 * Add a check so we can't pick up invisible objects (0.93.8) 2327 * Add a check so we can't pick up invisible objects (0.93.8)
2317 */ 2328 */
2318
2319int 2329int
2320can_pick (const object *who, const object *item) 2330can_pick (const object *who, const object *item)
2321{ 2331{
2322 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2332 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2323 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2333 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2328 * create clone from object to another 2338 * create clone from object to another
2329 */ 2339 */
2330object * 2340object *
2331object_create_clone (object *asrc) 2341object_create_clone (object *asrc)
2332{ 2342{
2333 object *dst = 0, *tmp, *src, *part, *prev, *item; 2343 object *dst = 0, *tmp, *src, *prev, *item;
2334 2344
2335 if (!asrc) 2345 if (!asrc)
2336 return 0; 2346 return 0;
2337 2347
2338 src = asrc;
2339 if (src->head)
2340 src = src->head; 2348 src = asrc->head_ ();
2341 2349
2342 prev = 0; 2350 prev = 0;
2343 for (part = src; part; part = part->more) 2351 for (object *part = src; part; part = part->more)
2344 { 2352 {
2345 tmp = part->clone (); 2353 tmp = part->clone ();
2346 tmp->x -= src->x; 2354 tmp->x -= src->x;
2347 tmp->y -= src->y; 2355 tmp->y -= src->y;
2348 2356
… …
2461 /* Basically, if the archetype has this key set, 2469 /* Basically, if the archetype has this key set,
2462 * we need to store the null value so when we save 2470 * we need to store the null value so when we save
2463 * it, we save the empty value so that when we load, 2471 * it, we save the empty value so that when we load,
2464 * we get this value back again. 2472 * we get this value back again.
2465 */ 2473 */
2466 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2474 if (get_ob_key_link (op->arch, canonical_key))
2467 field->value = 0; 2475 field->value = 0;
2468 else 2476 else
2469 { 2477 {
2470 if (last) 2478 if (last)
2471 last->next = field->next; 2479 last->next = field->next;
… …
2540 } 2548 }
2541 else 2549 else
2542 item = item->env; 2550 item = item->env;
2543} 2551}
2544 2552
2545
2546const char * 2553const char *
2547object::flag_desc (char *desc, int len) const 2554object::flag_desc (char *desc, int len) const
2548{ 2555{
2549 char *p = desc; 2556 char *p = desc;
2550 bool first = true; 2557 bool first = true;
… …
2584 &name, 2591 &name,
2585 title ? "\",title:\"" : "", 2592 title ? "\",title:\"" : "",
2586 title ? (const char *)title : "", 2593 title ? (const char *)title : "",
2587 flag_desc (flagdesc, 512), type); 2594 flag_desc (flagdesc, 512), type);
2588 2595
2589 if (env) 2596 if (!this->flag[FLAG_REMOVED] && env)
2590 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2597 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2591 2598
2592 if (map) 2599 if (map)
2593 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2600 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2594 2601
… …
2612} 2619}
2613 2620
2614const materialtype_t * 2621const materialtype_t *
2615object::dominant_material () const 2622object::dominant_material () const
2616{ 2623{
2617 if (materialtype_t *mat = name_to_material (materialname)) 2624 if (materialtype_t *mt = name_to_material (materialname))
2618 return mat; 2625 return mt;
2619 2626
2620 // omfg this is slow, this has to be temporary :)
2621 shstr unknown ("unknown");
2622
2623 return name_to_material (unknown); 2627 return name_to_material (shstr_unknown);
2624} 2628}
2625 2629
2626void 2630void
2627object::open_container (object *new_container) 2631object::open_container (object *new_container)
2628{ 2632{
… …
2644 old_container->flag [FLAG_APPLIED] = 0; 2648 old_container->flag [FLAG_APPLIED] = 0;
2645 container = 0; 2649 container = 0;
2646 2650
2647 esrv_update_item (UPD_FLAGS, this, old_container); 2651 esrv_update_item (UPD_FLAGS, this, old_container);
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2652 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2653 play_sound (sound_find ("chest_close"));
2649 } 2654 }
2650 2655
2651 if (new_container) 2656 if (new_container)
2652 { 2657 {
2653 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2658 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2669 new_container->flag [FLAG_APPLIED] = 1; 2674 new_container->flag [FLAG_APPLIED] = 1;
2670 container = new_container; 2675 container = new_container;
2671 2676
2672 esrv_update_item (UPD_FLAGS, this, new_container); 2677 esrv_update_item (UPD_FLAGS, this, new_container);
2673 esrv_send_inventory (this, new_container); 2678 esrv_send_inventory (this, new_container);
2679 play_sound (sound_find ("chest_open"));
2680 }
2681}
2682
2683object *
2684object::force_find (const shstr name)
2685{
2686 /* cycle through his inventory to look for the MARK we want to
2687 * place
2688 */
2689 for (object *tmp = inv; tmp; tmp = tmp->below)
2690 if (tmp->type == FORCE && tmp->slaying == name)
2691 return splay (tmp);
2692
2693 return 0;
2694}
2695
2696void
2697object::force_add (const shstr name, int duration)
2698{
2699 if (object *force = force_find (name))
2700 force->destroy ();
2701
2702 object *force = get_archetype (FORCE_NAME);
2703
2704 force->slaying = name;
2705 force->stats.food = 1;
2706 force->speed_left = -1.f;
2707
2708 force->set_speed (duration ? 1.f / duration : 0.f);
2709 force->flag [FLAG_IS_USED_UP] = true;
2710 force->flag [FLAG_APPLIED] = true;
2711
2712 insert (force);
2713}
2714
2715void
2716object::play_sound (faceidx sound) const
2717{
2718 if (!sound)
2719 return;
2720
2721 if (flag [FLAG_REMOVED])
2722 return;
2723
2724 if (env)
2674 } 2725 {
2726 if (object *pl = in_player ())
2727 pl->contr->play_sound (sound);
2728 }
2729 else
2730 map->play_sound (sound, x, y);
2675} 2731}
2676 2732
2677

Diff Legend

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