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.133 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 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 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
313
314 if (k1 != k2)
311 return 0; 315 return 0;
316 else if (k1 == 0)
317 return 1;
318 else if (!cfperl_can_merge (ob1, ob2))
319 return 0;
320 }
312 } 321 }
313 322
314 /* Everything passes, must be OK. */ 323 /* Everything passes, must be OK. */
315 return 1; 324 return 1;
316} 325}
… …
324sum_weight (object *op) 333sum_weight (object *op)
325{ 334{
326 long sum; 335 long sum;
327 object *inv; 336 object *inv;
328 337
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 338 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 339 {
331 if (inv->inv) 340 if (inv->inv)
332 sum_weight (inv); 341 sum_weight (inv);
342
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 343 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 344 }
335 345
336 if (op->type == CONTAINER && op->stats.Str) 346 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 347 sum = (sum * (100 - op->stats.Str)) / 100;
… …
373/* 383/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 384 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 385 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 386 * If it's not a multi-object, it is returned.
377 */ 387 */
378
379object * 388object *
380get_nearest_part (object *op, const object *pl) 389get_nearest_part (object *op, const object *pl)
381{ 390{
382 object *tmp, *closest; 391 object *tmp, *closest;
383 int last_dist, i; 392 int last_dist, i;
… …
428} 437}
429 438
430/* 439/*
431 * Sets the owner and sets the skill and exp pointers to owner's current 440 * Sets the owner and sets the skill and exp pointers to owner's current
432 * skill and experience objects. 441 * skill and experience objects.
442 * ACTUALLY NO! investigate! TODO
433 */ 443 */
434void 444void
435object::set_owner (object *owner) 445object::set_owner (object *owner)
436{ 446{
447 // allow objects which own objects
437 if (!owner) 448 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 449 while (owner->owner)
448 owner = owner->owner; 450 owner = owner->owner;
449 451
450 this->owner = owner; 452 this->owner = owner;
453}
454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance all your items at once, "
501 "but the %s is just too much for your body. "
502 "[You need to unapply some items first.]", &ob->name);
503 return false;
504 }
505
506 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
507 }
508 else
509 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
510
511 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
512 {
513 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
514 &name, ob->debug_desc ());
515 return false;
516 }
517
518 return true;
451} 519}
452 520
453/* Zero the key_values on op, decrementing the shared-string 521/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 522 * refcounts and freeing the links.
455 */ 523 */
456static void 524static void
457free_key_values (object *op) 525free_key_values (object *op)
458{ 526{
459 for (key_value *i = op->key_values; i != 0;) 527 for (key_value *i = op->key_values; i; )
460 { 528 {
461 key_value *next = i->next; 529 key_value *next = i->next;
462 delete i; 530 delete i;
463 531
464 i = next; 532 i = next;
465 } 533 }
466 534
467 op->key_values = 0; 535 op->key_values = 0;
468} 536}
469 537
470/* 538object &
471 * copy_to first frees everything allocated by the dst object, 539object::operator =(const object &src)
472 * and then copies the contents of itself into the second
473 * object, allocating what needs to be allocated. Basically, any
474 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
475 * if the first object is freed, the pointers in the new object
476 * will point at garbage.
477 */
478void
479object::copy_to (object *dst)
480{ 540{
481 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 541 bool is_freed = flag [FLAG_FREED];
482 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 542 bool is_removed = flag [FLAG_REMOVED];
483 543
484 *(object_copy *)dst = *this; 544 *(object_copy *)this = src;
485 545
486 if (is_freed) 546 flag [FLAG_FREED] = is_freed;
487 SET_FLAG (dst, FLAG_FREED); 547 flag [FLAG_REMOVED] = is_removed;
488
489 if (is_removed)
490 SET_FLAG (dst, FLAG_REMOVED);
491
492 if (speed < 0)
493 dst->speed_left = speed_left - rndm ();
494 548
495 /* Copy over key_values, if any. */ 549 /* Copy over key_values, if any. */
496 if (key_values) 550 if (src.key_values)
497 { 551 {
498 key_value *tail = 0; 552 key_value *tail = 0;
499 key_value *i;
500
501 dst->key_values = 0; 553 key_values = 0;
502 554
503 for (i = key_values; i; i = i->next) 555 for (key_value *i = src.key_values; i; i = i->next)
504 { 556 {
505 key_value *new_link = new key_value; 557 key_value *new_link = new key_value;
506 558
507 new_link->next = 0; 559 new_link->next = 0;
508 new_link->key = i->key; 560 new_link->key = i->key;
509 new_link->value = i->value; 561 new_link->value = i->value;
510 562
511 /* Try and be clever here, too. */ 563 /* Try and be clever here, too. */
512 if (!dst->key_values) 564 if (!key_values)
513 { 565 {
514 dst->key_values = new_link; 566 key_values = new_link;
515 tail = new_link; 567 tail = new_link;
516 } 568 }
517 else 569 else
518 { 570 {
519 tail->next = new_link; 571 tail->next = new_link;
520 tail = new_link; 572 tail = new_link;
521 } 573 }
522 } 574 }
523 } 575 }
576}
577
578/*
579 * copy_to first frees everything allocated by the dst object,
580 * and then copies the contents of itself into the second
581 * object, allocating what needs to be allocated. Basically, any
582 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
583 * if the first object is freed, the pointers in the new object
584 * will point at garbage.
585 */
586void
587object::copy_to (object *dst)
588{
589 *dst = *this;
590
591 if (speed < 0)
592 dst->speed_left -= rndm ();
524 593
525 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
526} 595}
527 596
528void 597void
… …
536 * need for monsters, but doesn't hurt to do it for everything. 605 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting 606 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created 607 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped. 608 * for it, they can be properly equipped.
540 */ 609 */
541 memcpy (body_used, body_info, sizeof (body_used)); 610 for (int i = NUM_BODY_LOCATIONS; i--; )
611 slot[i].used = slot[i].info;
542 612
543 attachable::instantiate (); 613 attachable::instantiate ();
544} 614}
545 615
546object * 616object *
… …
606 * UP_OBJ_FACE: only the objects face has changed. 676 * UP_OBJ_FACE: only the objects face has changed.
607 */ 677 */
608void 678void
609update_object (object *op, int action) 679update_object (object *op, int action)
610{ 680{
611 MoveType move_on, move_off, move_block, move_slow;
612
613 if (op == NULL) 681 if (op == NULL)
614 { 682 {
615 /* this should never happen */ 683 /* this should never happen */
616 LOG (llevDebug, "update_object() called for NULL object.\n"); 684 LOG (llevDebug, "update_object() called for NULL object.\n");
617 return; 685 return;
… …
836 904
837 if (flag [FLAG_IS_LINKED]) 905 if (flag [FLAG_IS_LINKED])
838 remove_button_link (this); 906 remove_button_link (this);
839 907
840 if (flag [FLAG_FRIENDLY]) 908 if (flag [FLAG_FRIENDLY])
841 {
842 remove_friendly_object (this); 909 remove_friendly_object (this);
843
844 if (type == GOLEM
845 && owner
846 && owner->type == PLAYER
847 && owner->contr->ranges[range_golem] == this)
848 owner->contr->ranges[range_golem] = 0;
849 }
850 910
851 if (!flag [FLAG_REMOVED]) 911 if (!flag [FLAG_REMOVED])
852 remove (); 912 remove ();
853 913
854 destroy_inv (true); 914 destroy_inv (true);
… …
864 924
865 if (!freed_map) 925 if (!freed_map)
866 { 926 {
867 freed_map = new maptile; 927 freed_map = new maptile;
868 928
929 freed_map->path = "<freed objects map>";
869 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
870 freed_map->width = 3; 931 freed_map->width = 3;
871 freed_map->height = 3; 932 freed_map->height = 3;
872 933
873 freed_map->alloc (); 934 freed_map->alloc ();
… …
877 map = freed_map; 938 map = freed_map;
878 x = 1; 939 x = 1;
879 y = 1; 940 y = 1;
880 } 941 }
881 942
882 head = 0;
883
884 if (more) 943 if (more)
885 { 944 {
886 more->destroy (); 945 more->destroy ();
887 more = 0; 946 more = 0;
888 } 947 }
889 948
949 head = 0;
950
890 // clear those pointers that likely might have circular references to us 951 // clear those pointers that likely might cause circular references
891 owner = 0; 952 owner = 0;
892 enemy = 0; 953 enemy = 0;
893 attacked_by = 0; 954 attacked_by = 0;
955 current_weapon = 0;
894} 956}
895 957
896void 958void
897object::destroy (bool destroy_inventory) 959object::destroy (bool destroy_inventory)
898{ 960{
899 if (destroyed ()) 961 if (destroyed ())
900 return; 962 return;
901 963
902 if (destroy_inventory) 964 if (destroy_inventory)
903 destroy_inv (false); 965 destroy_inv (false);
966
967 if (is_head ())
968 if (sound_destroy)
969 play_sound (sound_destroy);
970 else if (flag [FLAG_MONSTER])
971 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
904 972
905 attachable::destroy (); 973 attachable::destroy ();
906} 974}
907 975
908/* 976/*
… …
1023 if (map->in_memory == MAP_SAVING) 1091 if (map->in_memory == MAP_SAVING)
1024 return; 1092 return;
1025 1093
1026 int check_walk_off = !flag [FLAG_NO_APPLY]; 1094 int check_walk_off = !flag [FLAG_NO_APPLY];
1027 1095
1096 if (object *pl = ms.player ())
1097 {
1098 if (pl->container == this)
1099 /* If a container that the player is currently using somehow gets
1100 * removed (most likely destroyed), update the player view
1101 * appropriately.
1102 */
1103 pl->close_container ();
1104
1105 pl->contr->ns->floorbox_update ();
1106 }
1107
1028 for (tmp = ms.bot; tmp; tmp = tmp->above) 1108 for (tmp = ms.bot; tmp; tmp = tmp->above)
1029 { 1109 {
1030 /* No point updating the players look faces if he is the object 1110 /* No point updating the players look faces if he is the object
1031 * being removed. 1111 * being removed.
1032 */ 1112 */
1033
1034 if (tmp->type == PLAYER && tmp != this)
1035 {
1036 /* If a container that the player is currently using somehow gets
1037 * removed (most likely destroyed), update the player view
1038 * appropriately.
1039 */
1040 if (tmp->container == this)
1041 {
1042 flag [FLAG_APPLIED] = 0;
1043 tmp->container = 0;
1044 }
1045
1046 if (tmp->contr->ns)
1047 tmp->contr->ns->floorbox_update ();
1048 }
1049 1113
1050 /* See if object moving off should effect something */ 1114 /* See if object moving off should effect something */
1051 if (check_walk_off 1115 if (check_walk_off
1052 && ((move_type & tmp->move_off) 1116 && ((move_type & tmp->move_off)
1053 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1117 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1056 1120
1057 if (destroyed ()) 1121 if (destroyed ())
1058 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1122 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1059 } 1123 }
1060 1124
1061 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1062 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1063 if (tmp->above == tmp)
1064 tmp->above = 0;
1065
1066 last = tmp; 1125 last = tmp;
1067 } 1126 }
1068 1127
1069 /* last == NULL if there are no objects on this space */ 1128 /* last == NULL if there are no objects on this space */
1070 //TODO: this makes little sense, why only update the topmost object? 1129 //TODO: this makes little sense, why only update the topmost object?
… …
1113 } 1172 }
1114 1173
1115 return 0; 1174 return 0;
1116} 1175}
1117 1176
1177void
1178object::expand_tail ()
1179{
1180 if (more)
1181 return;
1182
1183 object *prev = this;
1184
1185 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 {
1187 object *op = arch_to_object (at);
1188
1189 op->name = name;
1190 op->name_pl = name_pl;
1191 op->title = title;
1192
1193 op->head = this;
1194 prev->more = op;
1195
1196 prev = op;
1197 }
1198}
1199
1118/* 1200/*
1119 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1201 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1120 * job preparing multi-part monsters. 1202 * job preparing multi-part monsters.
1121 */ 1203 */
1122object * 1204object *
1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124{ 1206{
1125 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1126 { 1208 {
1127 tmp->x = x + tmp->arch->clone.x; 1209 tmp->x = x + tmp->arch->x;
1128 tmp->y = y + tmp->arch->clone.y; 1210 tmp->y = y + tmp->arch->y;
1129 } 1211 }
1130 1212
1131 return insert_ob_in_map (op, m, originator, flag); 1213 return insert_ob_in_map (op, m, originator, flag);
1132} 1214}
1133 1215
… …
1152 * just 'op' otherwise 1234 * just 'op' otherwise
1153 */ 1235 */
1154object * 1236object *
1155insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1156{ 1238{
1239 assert (!op->flag [FLAG_FREED]);
1240
1157 object *tmp, *top, *floor = NULL; 1241 object *top, *floor = NULL;
1158
1159 if (QUERY_FLAG (op, FLAG_FREED))
1160 {
1161 LOG (llevError, "Trying to insert freed object!\n");
1162 return NULL;
1163 }
1164
1165 if (!QUERY_FLAG (op, FLAG_REMOVED))
1166 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1167 1242
1168 op->remove (); 1243 op->remove ();
1169
1170 if (!m)
1171 {
1172 char *dump = dump_object (op);
1173 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1174 free (dump);
1175 return op;
1176 }
1177
1178 if (out_of_map (m, op->x, op->y))
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1182#ifdef MANY_CORES
1183 /* Better to catch this here, as otherwise the next use of this object
1184 * is likely to cause a crash. Better to find out where it is getting
1185 * improperly inserted.
1186 */
1187 abort ();
1188#endif
1189 free (dump);
1190 return op;
1191 }
1192
1193 if (object *more = op->more)
1194 {
1195 if (!insert_ob_in_map (more, m, originator, flag))
1196 {
1197 if (!op->head)
1198 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1199
1200 return 0;
1201 }
1202 }
1203
1204 CLEAR_FLAG (op, FLAG_REMOVED);
1205 1244
1206 /* Ideally, the caller figures this out. However, it complicates a lot 1245 /* Ideally, the caller figures this out. However, it complicates a lot
1207 * of areas of callers (eg, anything that uses find_free_spot would now 1246 * of areas of callers (eg, anything that uses find_free_spot would now
1208 * need extra work 1247 * need extra work
1209 */ 1248 */
1210 if (!xy_normalise (m, op->x, op->y)) 1249 if (!xy_normalise (m, op->x, op->y))
1250 {
1251 op->destroy ();
1211 return 0; 1252 return 0;
1253 }
1254
1255 if (object *more = op->more)
1256 if (!insert_ob_in_map (more, m, originator, flag))
1257 return 0;
1258
1259 CLEAR_FLAG (op, FLAG_REMOVED);
1212 1260
1213 op->map = m; 1261 op->map = m;
1214 mapspace &ms = op->ms (); 1262 mapspace &ms = op->ms ();
1215 1263
1216 /* this has to be done after we translate the coordinates. 1264 /* this has to be done after we translate the coordinates.
1217 */ 1265 */
1218 if (op->nrof && !(flag & INS_NO_MERGE)) 1266 if (op->nrof && !(flag & INS_NO_MERGE))
1219 for (tmp = ms.bot; tmp; tmp = tmp->above) 1267 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1220 if (object::can_merge (op, tmp)) 1268 if (object::can_merge (op, tmp))
1221 { 1269 {
1222 op->nrof += tmp->nrof; 1270 op->nrof += tmp->nrof;
1223 tmp->destroy (); 1271 tmp->destroy ();
1224 } 1272 }
… …
1251 else 1299 else
1252 { 1300 {
1253 top = ms.bot; 1301 top = ms.bot;
1254 1302
1255 /* If there are other objects, then */ 1303 /* If there are other objects, then */
1256 if ((!(flag & INS_MAP_LOAD)) && top) 1304 if (top)
1257 { 1305 {
1258 object *last = 0; 1306 object *last = 0;
1259 1307
1260 /* 1308 /*
1261 * If there are multiple objects on this space, we do some trickier handling. 1309 * If there are multiple objects on this space, we do some trickier handling.
… …
1291 * looks like instead of lots of conditions here. 1339 * looks like instead of lots of conditions here.
1292 * makes things faster, and effectively the same result. 1340 * makes things faster, and effectively the same result.
1293 */ 1341 */
1294 1342
1295 /* Have object 'fall below' other objects that block view. 1343 /* Have object 'fall below' other objects that block view.
1296 * Unless those objects are exits, type 66 1344 * Unless those objects are exits.
1297 * If INS_ON_TOP is used, don't do this processing 1345 * If INS_ON_TOP is used, don't do this processing
1298 * Need to find the object that in fact blocks view, otherwise 1346 * Need to find the object that in fact blocks view, otherwise
1299 * stacking is a bit odd. 1347 * stacking is a bit odd.
1300 */ 1348 */
1301 if (!(flag & INS_ON_TOP) 1349 if (!(flag & INS_ON_TOP)
1302 && ms.flags () & P_BLOCKSVIEW 1350 && ms.flags () & P_BLOCKSVIEW
1303 && (op->face && !op->face->visibility)) 1351 && (op->face && !faces [op->face].visibility))
1304 { 1352 {
1305 for (last = top; last != floor; last = last->below) 1353 for (last = top; last != floor; last = last->below)
1306 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1354 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1307 break; 1355 break;
1308 1356
… …
1314 if (last && last->below && last != floor) 1362 if (last && last->below && last != floor)
1315 top = last->below; 1363 top = last->below;
1316 } 1364 }
1317 } /* If objects on this space */ 1365 } /* If objects on this space */
1318 1366
1319 if (flag & INS_MAP_LOAD)
1320 top = ms.top;
1321
1322 if (flag & INS_ABOVE_FLOOR_ONLY) 1367 if (flag & INS_ABOVE_FLOOR_ONLY)
1323 top = floor; 1368 top = floor;
1324 1369
1325 /* Top is the object that our object (op) is going to get inserted above. 1370 /* Top is the object that our object (op) is going to get inserted above.
1326 */ 1371 */
… …
1358 op->map->touch (); 1403 op->map->touch ();
1359 } 1404 }
1360 1405
1361 op->map->dirty = true; 1406 op->map->dirty = true;
1362 1407
1363 /* If we have a floor, we know the player, if any, will be above
1364 * it, so save a few ticks and start from there.
1365 */
1366 if (!(flag & INS_MAP_LOAD))
1367 if (object *pl = ms.player ()) 1408 if (object *pl = ms.player ())
1368 if (pl->contr->ns)
1369 pl->contr->ns->floorbox_update (); 1409 pl->contr->ns->floorbox_update ();
1370 1410
1371 /* If this object glows, it may affect lighting conditions that are 1411 /* If this object glows, it may affect lighting conditions that are
1372 * visible to others on this map. But update_all_los is really 1412 * visible to others on this map. But update_all_los is really
1373 * an inefficient way to do this, as it means los for all players 1413 * an inefficient way to do this, as it means los for all players
1374 * on the map will get recalculated. The players could very well 1414 * on the map will get recalculated. The players could very well
… …
1393 * blocked() and wall() work properly), and these flags are updated by 1433 * blocked() and wall() work properly), and these flags are updated by
1394 * update_object(). 1434 * update_object().
1395 */ 1435 */
1396 1436
1397 /* if this is not the head or flag has been passed, don't check walk on status */ 1437 /* if this is not the head or flag has been passed, don't check walk on status */
1398 if (!(flag & INS_NO_WALK_ON) && !op->head) 1438 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1399 { 1439 {
1400 if (check_move_on (op, originator)) 1440 if (check_move_on (op, originator))
1401 return 0; 1441 return 0;
1402 1442
1403 /* If we are a multi part object, lets work our way through the check 1443 /* If we are a multi part object, lets work our way through the check
1404 * walk on's. 1444 * walk on's.
1405 */ 1445 */
1406 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1446 for (object *tmp = op->more; tmp; tmp = tmp->more)
1407 if (check_move_on (tmp, originator)) 1447 if (check_move_on (tmp, originator))
1408 return 0; 1448 return 0;
1409 } 1449 }
1410 1450
1411 return op; 1451 return op;
… …
1421 object *tmp, *tmp1; 1461 object *tmp, *tmp1;
1422 1462
1423 /* first search for itself and remove any old instances */ 1463 /* first search for itself and remove any old instances */
1424 1464
1425 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1465 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1426 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1466 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1427 tmp->destroy (); 1467 tmp->destroy ();
1428 1468
1429 tmp1 = arch_to_object (archetype::find (arch_string)); 1469 tmp1 = arch_to_object (archetype::find (arch_string));
1430 1470
1431 tmp1->x = op->x; 1471 tmp1->x = op->x;
… …
1434} 1474}
1435 1475
1436object * 1476object *
1437object::insert_at (object *where, object *originator, int flags) 1477object::insert_at (object *where, object *originator, int flags)
1438{ 1478{
1439 where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1440} 1480}
1441 1481
1442/* 1482/*
1443 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1483 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1444 * is returned contains nr objects, and the remaining parts contains 1484 * is returned contains nr objects, and the remaining parts contains
… …
1484 * the amount of an object. If the amount reaches 0, the object 1524 * the amount of an object. If the amount reaches 0, the object
1485 * is subsequently removed and freed. 1525 * is subsequently removed and freed.
1486 * 1526 *
1487 * Return value: 'op' if something is left, NULL if the amount reached 0 1527 * Return value: 'op' if something is left, NULL if the amount reached 0
1488 */ 1528 */
1489
1490object * 1529object *
1491decrease_ob_nr (object *op, uint32 i) 1530decrease_ob_nr (object *op, uint32 i)
1492{ 1531{
1493 object *tmp; 1532 object *tmp;
1494 1533
… …
1569 1608
1570/* 1609/*
1571 * add_weight(object, weight) adds the specified weight to an object, 1610 * add_weight(object, weight) adds the specified weight to an object,
1572 * and also updates how much the environment(s) is/are carrying. 1611 * and also updates how much the environment(s) is/are carrying.
1573 */ 1612 */
1574
1575void 1613void
1576add_weight (object *op, signed long weight) 1614add_weight (object *op, signed long weight)
1577{ 1615{
1578 while (op != NULL) 1616 while (op != NULL)
1579 { 1617 {
… …
1594 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1632 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1595 free (dump); 1633 free (dump);
1596 return op; 1634 return op;
1597 } 1635 }
1598 1636
1599 if (where->head) 1637 if (where->head_ () != where)
1600 { 1638 {
1601 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1639 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1602 where = where->head; 1640 where = where->head;
1603 } 1641 }
1604 1642
1605 return where->insert (op); 1643 return where->insert (op);
1606} 1644}
… …
1611 * inside the object environment. 1649 * inside the object environment.
1612 * 1650 *
1613 * The function returns now pointer to inserted item, and return value can 1651 * The function returns now pointer to inserted item, and return value can
1614 * be != op, if items are merged. -Tero 1652 * be != op, if items are merged. -Tero
1615 */ 1653 */
1616
1617object * 1654object *
1618object::insert (object *op) 1655object::insert (object *op)
1619{ 1656{
1620 object *tmp, *otmp;
1621
1622 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1657 if (!QUERY_FLAG (op, FLAG_REMOVED))
1623 op->remove (); 1658 op->remove ();
1624 1659
1625 if (op->more) 1660 if (op->more)
1626 { 1661 {
… …
1628 return op; 1663 return op;
1629 } 1664 }
1630 1665
1631 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1666 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1632 CLEAR_FLAG (op, FLAG_REMOVED); 1667 CLEAR_FLAG (op, FLAG_REMOVED);
1668
1633 if (op->nrof) 1669 if (op->nrof)
1634 { 1670 {
1635 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1671 for (object *tmp = inv; tmp; tmp = tmp->below)
1636 if (object::can_merge (tmp, op)) 1672 if (object::can_merge (tmp, op))
1637 { 1673 {
1638 /* return the original object and remove inserted object 1674 /* return the original object and remove inserted object
1639 (client needs the original object) */ 1675 (client needs the original object) */
1640 tmp->nrof += op->nrof; 1676 tmp->nrof += op->nrof;
… …
1659 add_weight (this, op->weight * op->nrof); 1695 add_weight (this, op->weight * op->nrof);
1660 } 1696 }
1661 else 1697 else
1662 add_weight (this, (op->weight + op->carrying)); 1698 add_weight (this, (op->weight + op->carrying));
1663 1699
1664 otmp = this->in_player (); 1700 if (object *otmp = this->in_player ())
1665 if (otmp && otmp->contr)
1666 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1701 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1667 otmp->update_stats (); 1702 otmp->update_stats ();
1668 1703
1704 op->owner = 0; // its his/hers now. period.
1669 op->map = 0; 1705 op->map = 0;
1670 op->env = this; 1706 op->env = this;
1671 op->above = 0; 1707 op->above = 0;
1672 op->below = 0; 1708 op->below = 0;
1673 op->x = 0, op->y = 0; 1709 op->x = op->y = 0;
1674 1710
1675 /* reset the light list and los of the players on the map */ 1711 /* reset the light list and los of the players on the map */
1676 if ((op->glow_radius != 0) && map) 1712 if (op->glow_radius && map)
1677 { 1713 {
1678#ifdef DEBUG_LIGHTS 1714#ifdef DEBUG_LIGHTS
1679 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1715 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1680#endif /* DEBUG_LIGHTS */ 1716#endif /* DEBUG_LIGHTS */
1681 if (map->darkness) 1717 if (map->darkness)
… …
1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1971 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1936 { 1972 {
1937 CLEAR_FLAG (tmp, flag); 1973 CLEAR_FLAG (tmp, flag);
1938 unflag_inv (tmp, flag); 1974 unflag_inv (tmp, flag);
1939 } 1975 }
1940}
1941
1942/*
1943 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1944 * all it's inventory (recursively).
1945 * If checksums are used, a player will get set_cheat called for
1946 * him/her-self and all object carried by a call to this function.
1947 */
1948void
1949set_cheat (object *op)
1950{
1951 SET_FLAG (op, FLAG_WAS_WIZ);
1952 flag_inv (op, FLAG_WAS_WIZ);
1953} 1976}
1954 1977
1955/* 1978/*
1956 * find_free_spot(object, map, x, y, start, stop) will search for 1979 * find_free_spot(object, map, x, y, start, stop) will search for
1957 * a spot at the given map and coordinates which will be able to contain 1980 * a spot at the given map and coordinates which will be able to contain
… …
1974 * customized, changed states, etc. 1997 * customized, changed states, etc.
1975 */ 1998 */
1976int 1999int
1977find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1978{ 2001{
2002 int altern[SIZEOFFREE];
1979 int index = 0, flag; 2003 int index = 0, flag;
1980 int altern[SIZEOFFREE];
1981 2004
1982 for (int i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
1983 { 2006 {
1984 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 mapxy pos (m, x, y); pos.move (i);
1985 if (!flag) 2008
2009 if (!pos.normalise ())
2010 continue;
2011
2012 mapspace &ms = *pos;
2013
2014 if (ms.flags () & P_IS_ALIVE)
2015 continue;
2016
2017 /* However, often
2018 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 {
1986 altern [index++] = i; 2023 altern [index++] = i;
2024 continue;
2025 }
1987 2026
1988 /* Basically, if we find a wall on a space, we cut down the search size. 2027 /* Basically, if we find a wall on a space, we cut down the search size.
1989 * In this way, we won't return spaces that are on another side of a wall. 2028 * In this way, we won't return spaces that are on another side of a wall.
1990 * This mostly work, but it cuts down the search size in all directions - 2029 * This mostly work, but it cuts down the search size in all directions -
1991 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
1992 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
1993 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
1994 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
1995 */ 2034 */
1996 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2035 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2036 {
1997 stop = maxfree[i]; 2037 stop = maxfree[i];
2038 continue;
2039 }
2040
2041 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object.
2043 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2045 continue;
2046
2047 altern [index++] = i;
1998 } 2048 }
1999 2049
2000 if (!index) 2050 if (!index)
2001 return -1; 2051 return -1;
2002 2052
… …
2011 */ 2061 */
2012int 2062int
2013find_first_free_spot (const object *ob, maptile *m, int x, int y) 2063find_first_free_spot (const object *ob, maptile *m, int x, int y)
2014{ 2064{
2015 for (int i = 0; i < SIZEOFFREE; i++) 2065 for (int i = 0; i < SIZEOFFREE; i++)
2016 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2066 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2017 return i; 2067 return i;
2018 2068
2019 return -1; 2069 return -1;
2020} 2070}
2021 2071
… …
2075 object *tmp; 2125 object *tmp;
2076 maptile *mp; 2126 maptile *mp;
2077 2127
2078 MoveType blocked, move_type; 2128 MoveType blocked, move_type;
2079 2129
2080 if (exclude && exclude->head) 2130 if (exclude && exclude->head_ () != exclude)
2081 { 2131 {
2082 exclude = exclude->head; 2132 exclude = exclude->head;
2083 move_type = exclude->move_type; 2133 move_type = exclude->move_type;
2084 } 2134 }
2085 else 2135 else
… …
2108 max = maxfree[i]; 2158 max = maxfree[i];
2109 else if (mflags & P_IS_ALIVE) 2159 else if (mflags & P_IS_ALIVE)
2110 { 2160 {
2111 for (tmp = ms.bot; tmp; tmp = tmp->above) 2161 for (tmp = ms.bot; tmp; tmp = tmp->above)
2112 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2162 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2113 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2163 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2114 break; 2164 break;
2115 2165
2116 if (tmp) 2166 if (tmp)
2117 return freedir[i]; 2167 return freedir[i];
2118 } 2168 }
… …
2298 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2299 * core dumps if they do. 2349 * core dumps if they do.
2300 * 2350 *
2301 * Add a check so we can't pick up invisible objects (0.93.8) 2351 * Add a check so we can't pick up invisible objects (0.93.8)
2302 */ 2352 */
2303
2304int 2353int
2305can_pick (const object *who, const object *item) 2354can_pick (const object *who, const object *item)
2306{ 2355{
2307 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2356 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2308 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2357 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2313 * create clone from object to another 2362 * create clone from object to another
2314 */ 2363 */
2315object * 2364object *
2316object_create_clone (object *asrc) 2365object_create_clone (object *asrc)
2317{ 2366{
2318 object *dst = 0, *tmp, *src, *part, *prev, *item; 2367 object *dst = 0, *tmp, *src, *prev, *item;
2319 2368
2320 if (!asrc) 2369 if (!asrc)
2321 return 0; 2370 return 0;
2322 2371
2323 src = asrc;
2324 if (src->head)
2325 src = src->head; 2372 src = asrc->head_ ();
2326 2373
2327 prev = 0; 2374 prev = 0;
2328 for (part = src; part; part = part->more) 2375 for (object *part = src; part; part = part->more)
2329 { 2376 {
2330 tmp = part->clone (); 2377 tmp = part->clone ();
2331 tmp->x -= src->x; 2378 tmp->x -= src->x;
2332 tmp->y -= src->y; 2379 tmp->y -= src->y;
2333 2380
… …
2413 if (link->key == canonical_key) 2460 if (link->key == canonical_key)
2414 return link->value; 2461 return link->value;
2415 2462
2416 return 0; 2463 return 0;
2417} 2464}
2418
2419 2465
2420/* 2466/*
2421 * Updates the canonical_key in op to value. 2467 * Updates the canonical_key in op to value.
2422 * 2468 *
2423 * canonical_key is a shared string (value doesn't have to be). 2469 * canonical_key is a shared string (value doesn't have to be).
… …
2447 /* Basically, if the archetype has this key set, 2493 /* Basically, if the archetype has this key set,
2448 * we need to store the null value so when we save 2494 * we need to store the null value so when we save
2449 * it, we save the empty value so that when we load, 2495 * it, we save the empty value so that when we load,
2450 * we get this value back again. 2496 * we get this value back again.
2451 */ 2497 */
2452 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2498 if (get_ob_key_link (op->arch, canonical_key))
2453 field->value = 0; 2499 field->value = 0;
2454 else 2500 else
2455 { 2501 {
2456 if (last) 2502 if (last)
2457 last->next = field->next; 2503 last->next = field->next;
… …
2526 } 2572 }
2527 else 2573 else
2528 item = item->env; 2574 item = item->env;
2529} 2575}
2530 2576
2531
2532const char * 2577const char *
2533object::flag_desc (char *desc, int len) const 2578object::flag_desc (char *desc, int len) const
2534{ 2579{
2535 char *p = desc; 2580 char *p = desc;
2536 bool first = true; 2581 bool first = true;
… …
2570 &name, 2615 &name,
2571 title ? "\",title:\"" : "", 2616 title ? "\",title:\"" : "",
2572 title ? (const char *)title : "", 2617 title ? (const char *)title : "",
2573 flag_desc (flagdesc, 512), type); 2618 flag_desc (flagdesc, 512), type);
2574 2619
2575 if (env) 2620 if (!this->flag[FLAG_REMOVED] && env)
2576 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2577 2622
2578 if (map) 2623 if (map)
2579 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2580 2625
… …
2582} 2627}
2583 2628
2584const char * 2629const char *
2585object::debug_desc () const 2630object::debug_desc () const
2586{ 2631{
2587 static char info[256 * 4]; 2632 static char info[3][256 * 4];
2633 static int info_idx;
2634
2588 return debug_desc (info); 2635 return debug_desc (info [++info_idx % 3]);
2589}
2590
2591const char *
2592object::debug_desc2 () const
2593{
2594 static char info[256 * 4];
2595 return debug_desc (info);
2596} 2636}
2597 2637
2598struct region * 2638struct region *
2599object::region () const 2639object::region () const
2600{ 2640{
… …
2603} 2643}
2604 2644
2605const materialtype_t * 2645const materialtype_t *
2606object::dominant_material () const 2646object::dominant_material () const
2607{ 2647{
2608 if (materialtype_t *mat = name_to_material (materialname)) 2648 if (materialtype_t *mt = name_to_material (materialname))
2609 return mat; 2649 return mt;
2610 2650
2611 // omfg this is slow, this has to be temporary :)
2612 shstr unknown ("unknown");
2613
2614 return name_to_material (unknown); 2651 return name_to_material (shstr_unknown);
2615} 2652}
2616 2653
2617void 2654void
2618object::open_container (object *new_container) 2655object::open_container (object *new_container)
2619{ 2656{
… …
2635 old_container->flag [FLAG_APPLIED] = 0; 2672 old_container->flag [FLAG_APPLIED] = 0;
2636 container = 0; 2673 container = 0;
2637 2674
2638 esrv_update_item (UPD_FLAGS, this, old_container); 2675 esrv_update_item (UPD_FLAGS, this, old_container);
2639 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2676 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2677 play_sound (sound_find ("chest_close"));
2640 } 2678 }
2641 2679
2642 if (new_container) 2680 if (new_container)
2643 { 2681 {
2644 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2660 new_container->flag [FLAG_APPLIED] = 1; 2698 new_container->flag [FLAG_APPLIED] = 1;
2661 container = new_container; 2699 container = new_container;
2662 2700
2663 esrv_update_item (UPD_FLAGS, this, new_container); 2701 esrv_update_item (UPD_FLAGS, this, new_container);
2664 esrv_send_inventory (this, new_container); 2702 esrv_send_inventory (this, new_container);
2703 play_sound (sound_find ("chest_open"));
2704 }
2705}
2706
2707object *
2708object::force_find (const shstr name)
2709{
2710 /* cycle through his inventory to look for the MARK we want to
2711 * place
2712 */
2713 for (object *tmp = inv; tmp; tmp = tmp->below)
2714 if (tmp->type == FORCE && tmp->slaying == name)
2715 return splay (tmp);
2716
2717 return 0;
2718}
2719
2720void
2721object::force_add (const shstr name, int duration)
2722{
2723 if (object *force = force_find (name))
2724 force->destroy ();
2725
2726 object *force = get_archetype (FORCE_NAME);
2727
2728 force->slaying = name;
2729 force->stats.food = 1;
2730 force->speed_left = -1.f;
2731
2732 force->set_speed (duration ? 1.f / duration : 0.f);
2733 force->flag [FLAG_IS_USED_UP] = true;
2734 force->flag [FLAG_APPLIED] = true;
2735
2736 insert (force);
2737}
2738
2739void
2740object::play_sound (faceidx sound) const
2741{
2742 if (!sound)
2743 return;
2744
2745 if (flag [FLAG_REMOVED])
2746 return;
2747
2748 if (env)
2665 } 2749 {
2750 if (object *pl = in_player ())
2751 pl->contr->play_sound (sound);
2752 }
2753 else
2754 map->play_sound (sound, x, y);
2666} 2755}
2667 2756
2668

Diff Legend

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