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

Diff Legend

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