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.131 by root, Sat Feb 10 15:20:23 2007 UTC vs.
Revision 1.202 by root, Thu Apr 10 15:35:15 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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; 38UUID UUID::cur;
39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19; 39static const uint64 UUID_SKIP = 1<<19;
41 40
42objectvec objects; 41objectvec objects;
43activevec actives; 42activevec actives;
44 43
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 44short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
70 { 69 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); 70 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return; 71 return;
73 } 72 }
74 73
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); 74 fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
76 fclose (fp); 75 fclose (fp);
77 rename (filename2, filename1); 76 rename (filename2, filename1);
78} 77}
79 78
80static void 79static void
… …
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid ();
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
… …
106 { 105 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 106 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
108 _exit (1); 107 _exit (1);
109 } 108 }
110 109
111 uuid.seq = uid; 110 UUID::cur.seq = uid;
112 write_uuid (); 111 write_uuid ();
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 112 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
114 fclose (fp); 113 fclose (fp);
115} 114}
116 115
117UUID 116UUID
118gen_uuid () 117UUID::gen ()
119{ 118{
120 UUID uid; 119 UUID uid;
121 120
122 uid.seq = ++uuid.seq; 121 uid.seq = ++cur.seq;
123 122
124 if (!(uuid.seq & (UUID_SKIP - 1))) 123 if (!(cur.seq & (UUID_SKIP - 1)))
125 write_uuid (); 124 write_uuid ();
126 125
127 return uid; 126 return uid;
128} 127}
129 128
130void 129void
131init_uuid () 130UUID::init ()
132{ 131{
133 read_uuid (); 132 read_uuid ();
134} 133}
135 134
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 135/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
254 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 254 * check all objects in the inventory.
256 */ 255 */
257 if (ob1->inv || ob2->inv) 256 if (ob1->inv || ob2->inv)
258 { 257 {
259 /* if one object has inventory but the other doesn't, not equiv */ 258 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 return 0; /* inventories differ in length */
261 return 0;
262 260
263 /* Now check to see if the two inventory objects could merge */ 261 if (ob1->inv->below || ob2->inv->below)
262 return 0; /* more than one object in inv */
263
264 if (!object::can_merge (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 265 return 0; /* inventory objexts differ */
266 266
267 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 268 * if it is valid.
269 */ 269 */
270 } 270 }
… …
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 (ob1->self) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (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;
… …
357/* 367/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 368 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 369 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 370 * The result of the dump is stored in the static global errmsg array.
361 */ 371 */
362
363char * 372char *
364dump_object (object *op) 373dump_object (object *op)
365{ 374{
366 if (!op) 375 if (!op)
367 return strdup ("[NULLOBJ]"); 376 return strdup ("[NULLOBJ]");
368 377
369 object_freezer freezer; 378 object_freezer freezer;
370 save_object (freezer, op, 1); 379 op->write (freezer);
371 return freezer.as_string (); 380 return freezer.as_string ();
372} 381}
373 382
374/* 383/*
375 * 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
376 * multi-object 1 which is closest to the second object. 385 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 386 * If it's not a multi-object, it is returned.
378 */ 387 */
379
380object * 388object *
381get_nearest_part (object *op, const object *pl) 389get_nearest_part (object *op, const object *pl)
382{ 390{
383 object *tmp, *closest; 391 object *tmp, *closest;
384 int last_dist, i; 392 int last_dist, i;
… …
420 break; 428 break;
421 429
422 return op; 430 return op;
423} 431}
424 432
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 433/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 434 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 435 * skill and experience objects.
436 * ACTUALLY NO! investigate! TODO
434 */ 437 */
435void 438void
436object::set_owner (object *owner) 439object::set_owner (object *owner)
437{ 440{
441 // allow objects which own objects
438 if (!owner) 442 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 443 while (owner->owner)
449 owner = owner->owner; 444 owner = owner->owner;
445
446 if (flag [FLAG_FREED])
447 {
448 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
449 return;
450 }
450 451
451 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;
452} 519}
453 520
454/* Zero the key_values on op, decrementing the shared-string 521/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 522 * refcounts and freeing the links.
456 */ 523 */
457static void 524static void
458free_key_values (object *op) 525free_key_values (object *op)
459{ 526{
460 for (key_value *i = op->key_values; i != 0;) 527 for (key_value *i = op->key_values; i; )
461 { 528 {
462 key_value *next = i->next; 529 key_value *next = i->next;
463 delete i; 530 delete i;
464 531
465 i = next; 532 i = next;
466 } 533 }
467 534
468 op->key_values = 0; 535 op->key_values = 0;
469} 536}
470 537
471/* 538object &
472 * copy_to first frees everything allocated by the dst object, 539object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 540{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 541 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 542 bool is_removed = flag [FLAG_REMOVED];
484 543
485 *(object_copy *)dst = *this; 544 *(object_copy *)this = src;
486 545
487 if (is_freed) 546 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 547 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 548
496 /* Copy over key_values, if any. */ 549 /* Copy over key_values, if any. */
497 if (key_values) 550 if (src.key_values)
498 { 551 {
499 key_value *tail = 0; 552 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 553 key_values = 0;
503 554
504 for (i = key_values; i; i = i->next) 555 for (key_value *i = src.key_values; i; i = i->next)
505 { 556 {
506 key_value *new_link = new key_value; 557 key_value *new_link = new key_value;
507 558
508 new_link->next = 0; 559 new_link->next = 0;
509 new_link->key = i->key; 560 new_link->key = i->key;
510 new_link->value = i->value; 561 new_link->value = i->value;
511 562
512 /* Try and be clever here, too. */ 563 /* Try and be clever here, too. */
513 if (!dst->key_values) 564 if (!key_values)
514 { 565 {
515 dst->key_values = new_link; 566 key_values = new_link;
516 tail = new_link; 567 tail = new_link;
517 } 568 }
518 else 569 else
519 { 570 {
520 tail->next = new_link; 571 tail->next = new_link;
521 tail = new_link; 572 tail = new_link;
522 } 573 }
523 } 574 }
524 } 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 ();
525 593
526 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
595}
596
597void
598object::instantiate ()
599{
600 if (!uuid.seq) // HACK
601 uuid = UUID::gen ();
602
603 speed_left = -0.1f;
604 /* copy the body_info to the body_used - this is only really
605 * need for monsters, but doesn't hurt to do it for everything.
606 * by doing so, when a monster is created, it has good starting
607 * values for the body_used info, so when items are created
608 * for it, they can be properly equipped.
609 */
610 for (int i = NUM_BODY_LOCATIONS; i--; )
611 slot[i].used = slot[i].info;
612
613 attachable::instantiate ();
527} 614}
528 615
529object * 616object *
530object::clone () 617object::clone ()
531{ 618{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 676 * UP_OBJ_FACE: only the objects face has changed.
590 */ 677 */
591void 678void
592update_object (object *op, int action) 679update_object (object *op, int action)
593{ 680{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 681 if (op == NULL)
597 { 682 {
598 /* this should never happen */ 683 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 684 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 685 return;
… …
680static int object_count; 765static int object_count;
681 766
682void object::link () 767void object::link ()
683{ 768{
684 assert (!index);//D 769 assert (!index);//D
685 uuid = gen_uuid (); 770 uuid = UUID::gen ();
686 count = ++object_count; 771 count = ++object_count;
687 772
688 refcnt_inc (); 773 refcnt_inc ();
689 objects.insert (this); 774 objects.insert (this);
690} 775}
… …
819 904
820 if (flag [FLAG_IS_LINKED]) 905 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 906 remove_button_link (this);
822 907
823 if (flag [FLAG_FRIENDLY]) 908 if (flag [FLAG_FRIENDLY])
824 {
825 remove_friendly_object (this); 909 remove_friendly_object (this);
826
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
833 910
834 if (!flag [FLAG_REMOVED]) 911 if (!flag [FLAG_REMOVED])
835 remove (); 912 remove ();
836 913
837 destroy_inv (true); 914 destroy_inv (true);
… …
847 924
848 if (!freed_map) 925 if (!freed_map)
849 { 926 {
850 freed_map = new maptile; 927 freed_map = new maptile;
851 928
929 freed_map->path = "<freed objects map>";
852 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
853 freed_map->width = 3; 931 freed_map->width = 3;
854 freed_map->height = 3; 932 freed_map->height = 3;
933 freed_map->nodrop = 1;
855 934
856 freed_map->alloc (); 935 freed_map->alloc ();
857 freed_map->in_memory = MAP_IN_MEMORY; 936 freed_map->in_memory = MAP_IN_MEMORY;
858 } 937 }
859 938
860 map = freed_map; 939 map = freed_map;
861 x = 1; 940 x = 1;
862 y = 1; 941 y = 1;
863 } 942 }
864 943
865 head = 0;
866
867 if (more) 944 if (more)
868 { 945 {
869 more->destroy (); 946 more->destroy ();
870 more = 0; 947 more = 0;
871 } 948 }
872 949
950 head = 0;
951
873 // clear those pointers that likely might have circular references to us 952 // clear those pointers that likely might cause circular references
874 owner = 0; 953 owner = 0;
875 enemy = 0; 954 enemy = 0;
876 attacked_by = 0; 955 attacked_by = 0;
956 current_weapon = 0;
877} 957}
878 958
879void 959void
880object::destroy (bool destroy_inventory) 960object::destroy (bool destroy_inventory)
881{ 961{
882 if (destroyed ()) 962 if (destroyed ())
883 return; 963 return;
884 964
885 if (destroy_inventory) 965 if (destroy_inventory)
886 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
887 973
888 attachable::destroy (); 974 attachable::destroy ();
889} 975}
890 976
891/* 977/*
… …
1006 if (map->in_memory == MAP_SAVING) 1092 if (map->in_memory == MAP_SAVING)
1007 return; 1093 return;
1008 1094
1009 int check_walk_off = !flag [FLAG_NO_APPLY]; 1095 int check_walk_off = !flag [FLAG_NO_APPLY];
1010 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
1011 for (tmp = ms.bot; tmp; tmp = tmp->above) 1109 for (tmp = ms.bot; tmp; tmp = tmp->above)
1012 { 1110 {
1013 /* 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
1014 * being removed. 1112 * being removed.
1015 */ 1113 */
1016
1017 if (tmp->type == PLAYER && tmp != this)
1018 {
1019 /* If a container that the player is currently using somehow gets
1020 * removed (most likely destroyed), update the player view
1021 * appropriately.
1022 */
1023 if (tmp->container == this)
1024 {
1025 flag [FLAG_APPLIED] = 0;
1026 tmp->container = 0;
1027 }
1028
1029 if (tmp->contr->ns)
1030 tmp->contr->ns->floorbox_update ();
1031 }
1032 1114
1033 /* See if object moving off should effect something */ 1115 /* See if object moving off should effect something */
1034 if (check_walk_off 1116 if (check_walk_off
1035 && ((move_type & tmp->move_off) 1117 && ((move_type & tmp->move_off)
1036 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1039 1121
1040 if (destroyed ()) 1122 if (destroyed ())
1041 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 ());
1042 } 1124 }
1043 1125
1044 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1045 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1046 if (tmp->above == tmp)
1047 tmp->above = 0;
1048
1049 last = tmp; 1126 last = tmp;
1050 } 1127 }
1051 1128
1052 /* last == NULL if there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1053 //TODO: this makes little sense, why only update the topmost object? 1130 //TODO: this makes little sense, why only update the topmost object?
… …
1073merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1074{ 1151{
1075 if (!op->nrof) 1152 if (!op->nrof)
1076 return 0; 1153 return 0;
1077 1154
1078 if (top) 1155 if (!top)
1079 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1080 ; 1157 ;
1081 1158
1082 for (; top; top = top->below) 1159 for (; top; top = top->below)
1083 { 1160 {
… …
1096 } 1173 }
1097 1174
1098 return 0; 1175 return 0;
1099} 1176}
1100 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
1101/* 1201/*
1102 * 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
1103 * job preparing multi-part monsters. 1203 * job preparing multi-part monsters.
1104 */ 1204 */
1105object * 1205object *
1106insert_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)
1107{ 1207{
1108 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1109 { 1209 {
1110 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->x;
1111 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->y;
1112 } 1212 }
1113 1213
1114 return insert_ob_in_map (op, m, originator, flag); 1214 return insert_ob_in_map (op, m, originator, flag);
1115} 1215}
1116 1216
… …
1135 * just 'op' otherwise 1235 * just 'op' otherwise
1136 */ 1236 */
1137object * 1237object *
1138insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1238insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1139{ 1239{
1240 assert (!op->flag [FLAG_FREED]);
1241
1140 object *tmp, *top, *floor = NULL; 1242 object *top, *floor = NULL;
1141
1142 if (QUERY_FLAG (op, FLAG_FREED))
1143 {
1144 LOG (llevError, "Trying to insert freed object!\n");
1145 return NULL;
1146 }
1147
1148 if (!QUERY_FLAG (op, FLAG_REMOVED))
1149 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1150 1243
1151 op->remove (); 1244 op->remove ();
1152
1153 if (!m)
1154 {
1155 char *dump = dump_object (op);
1156 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1157 free (dump);
1158 return op;
1159 }
1160
1161 if (out_of_map (m, op->x, op->y))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1165#ifdef MANY_CORES
1166 /* Better to catch this here, as otherwise the next use of this object
1167 * is likely to cause a crash. Better to find out where it is getting
1168 * improperly inserted.
1169 */
1170 abort ();
1171#endif
1172 free (dump);
1173 return op;
1174 }
1175
1176 if (object *more = op->more)
1177 {
1178 if (!insert_ob_in_map (more, m, originator, flag))
1179 {
1180 if (!op->head)
1181 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1182
1183 return 0;
1184 }
1185 }
1186
1187 CLEAR_FLAG (op, FLAG_REMOVED);
1188 1245
1189 /* Ideally, the caller figures this out. However, it complicates a lot 1246 /* Ideally, the caller figures this out. However, it complicates a lot
1190 * 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
1191 * need extra work 1248 * need extra work
1192 */ 1249 */
1193 if (!xy_normalise (m, op->x, op->y)) 1250 if (!xy_normalise (m, op->x, op->y))
1251 {
1252 op->destroy ();
1194 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);
1195 1261
1196 op->map = m; 1262 op->map = m;
1197 mapspace &ms = op->ms (); 1263 mapspace &ms = op->ms ();
1198 1264
1199 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1200 */ 1266 */
1201 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1202 for (tmp = ms.bot; tmp; tmp = tmp->above) 1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1203 if (object::can_merge (op, tmp)) 1269 if (object::can_merge (op, tmp))
1204 { 1270 {
1205 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1206 tmp->destroy (); 1272 tmp->destroy ();
1207 } 1273 }
… …
1234 else 1300 else
1235 { 1301 {
1236 top = ms.bot; 1302 top = ms.bot;
1237 1303
1238 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1239 if ((!(flag & INS_MAP_LOAD)) && top) 1305 if (top)
1240 { 1306 {
1241 object *last = 0; 1307 object *last = 0;
1242 1308
1243 /* 1309 /*
1244 * 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.
… …
1274 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1275 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1276 */ 1342 */
1277 1343
1278 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1279 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1280 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1281 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1282 * stacking is a bit odd. 1348 * stacking is a bit odd.
1283 */ 1349 */
1284 if (!(flag & INS_ON_TOP) 1350 if (!(flag & INS_ON_TOP)
1285 && ms.flags () & P_BLOCKSVIEW 1351 && ms.flags () & P_BLOCKSVIEW
1286 && (op->face && !op->face->visibility)) 1352 && (op->face && !faces [op->face].visibility))
1287 { 1353 {
1288 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1289 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1290 break; 1356 break;
1291 1357
… …
1297 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1298 top = last->below; 1364 top = last->below;
1299 } 1365 }
1300 } /* If objects on this space */ 1366 } /* If objects on this space */
1301 1367
1302 if (flag & INS_MAP_LOAD)
1303 top = ms.top;
1304
1305 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1306 top = floor; 1369 top = floor;
1307 1370
1308 /* 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.
1309 */ 1372 */
… …
1341 op->map->touch (); 1404 op->map->touch ();
1342 } 1405 }
1343 1406
1344 op->map->dirty = true; 1407 op->map->dirty = true;
1345 1408
1346 /* If we have a floor, we know the player, if any, will be above
1347 * it, so save a few ticks and start from there.
1348 */
1349 if (!(flag & INS_MAP_LOAD))
1350 if (object *pl = ms.player ()) 1409 if (object *pl = ms.player ())
1351 if (pl->contr->ns)
1352 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1353 1411
1354 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1355 * 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
1356 * 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
1357 * on the map will get recalculated. The players could very well 1415 * on the map will get recalculated. The players could very well
… …
1376 * blocked() and wall() work properly), and these flags are updated by 1434 * blocked() and wall() work properly), and these flags are updated by
1377 * update_object(). 1435 * update_object().
1378 */ 1436 */
1379 1437
1380 /* 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 */
1381 if (!(flag & INS_NO_WALK_ON) && !op->head) 1439 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1382 { 1440 {
1383 if (check_move_on (op, originator)) 1441 if (check_move_on (op, originator))
1384 return 0; 1442 return 0;
1385 1443
1386 /* 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
1387 * walk on's. 1445 * walk on's.
1388 */ 1446 */
1389 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1447 for (object *tmp = op->more; tmp; tmp = tmp->more)
1390 if (check_move_on (tmp, originator)) 1448 if (check_move_on (tmp, originator))
1391 return 0; 1449 return 0;
1392 } 1450 }
1393 1451
1394 return op; 1452 return op;
… …
1404 object *tmp, *tmp1; 1462 object *tmp, *tmp1;
1405 1463
1406 /* first search for itself and remove any old instances */ 1464 /* first search for itself and remove any old instances */
1407 1465
1408 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1409 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1410 tmp->destroy (); 1468 tmp->destroy ();
1411 1469
1412 tmp1 = arch_to_object (archetype::find (arch_string)); 1470 tmp1 = arch_to_object (archetype::find (arch_string));
1413 1471
1414 tmp1->x = op->x; 1472 tmp1->x = op->x;
… …
1417} 1475}
1418 1476
1419object * 1477object *
1420object::insert_at (object *where, object *originator, int flags) 1478object::insert_at (object *where, object *originator, int flags)
1421{ 1479{
1422 where->map->insert (this, where->x, where->y, originator, flags); 1480 return where->map->insert (this, where->x, where->y, originator, flags);
1423} 1481}
1424 1482
1425/* 1483/*
1426 * 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
1427 * is returned contains nr objects, and the remaining parts contains 1485 * is returned contains nr objects, and the remaining parts contains
… …
1467 * 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
1468 * is subsequently removed and freed. 1526 * is subsequently removed and freed.
1469 * 1527 *
1470 * 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
1471 */ 1529 */
1472
1473object * 1530object *
1474decrease_ob_nr (object *op, uint32 i) 1531decrease_ob_nr (object *op, uint32 i)
1475{ 1532{
1476 object *tmp; 1533 object *tmp;
1477 1534
… …
1552 1609
1553/* 1610/*
1554 * add_weight(object, weight) adds the specified weight to an object, 1611 * add_weight(object, weight) adds the specified weight to an object,
1555 * and also updates how much the environment(s) is/are carrying. 1612 * and also updates how much the environment(s) is/are carrying.
1556 */ 1613 */
1557
1558void 1614void
1559add_weight (object *op, signed long weight) 1615add_weight (object *op, signed long weight)
1560{ 1616{
1561 while (op != NULL) 1617 while (op != NULL)
1562 { 1618 {
… …
1577 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);
1578 free (dump); 1634 free (dump);
1579 return op; 1635 return op;
1580 } 1636 }
1581 1637
1582 if (where->head) 1638 if (where->head_ () != where)
1583 { 1639 {
1584 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");
1585 where = where->head; 1641 where = where->head;
1586 } 1642 }
1587 1643
1588 return where->insert (op); 1644 return where->insert (op);
1589} 1645}
… …
1594 * inside the object environment. 1650 * inside the object environment.
1595 * 1651 *
1596 * 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
1597 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1598 */ 1654 */
1599
1600object * 1655object *
1601object::insert (object *op) 1656object::insert (object *op)
1602{ 1657{
1603 object *tmp, *otmp;
1604
1605 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1606 op->remove (); 1659 op->remove ();
1607 1660
1608 if (op->more) 1661 if (op->more)
1609 { 1662 {
… …
1611 return op; 1664 return op;
1612 } 1665 }
1613 1666
1614 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1615 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1616 if (op->nrof) 1670 if (op->nrof)
1617 { 1671 {
1618 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1619 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1620 { 1674 {
1621 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1622 (client needs the original object) */ 1676 (client needs the original object) */
1623 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
… …
1642 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1643 } 1697 }
1644 else 1698 else
1645 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1646 1700
1647 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1648 if (otmp && otmp->contr)
1649 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1650 otmp->update_stats (); 1703 otmp->update_stats ();
1651 1704
1705 op->owner = 0; // its his/hers now. period.
1652 op->map = 0; 1706 op->map = 0;
1653 op->env = this; 1707 op->env = this;
1654 op->above = 0; 1708 op->above = 0;
1655 op->below = 0; 1709 op->below = 0;
1656 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1657 1711
1658 /* 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 */
1659 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1660 { 1714 {
1661#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1662 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);
1663#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1664 if (map->darkness) 1718 if (map->darkness)
… …
1898 * activate recursively a flag on an object inventory 1952 * activate recursively a flag on an object inventory
1899 */ 1953 */
1900void 1954void
1901flag_inv (object *op, int flag) 1955flag_inv (object *op, int flag)
1902{ 1956{
1903 if (op->inv)
1904 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1957 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1905 { 1958 {
1906 SET_FLAG (tmp, flag); 1959 SET_FLAG (tmp, flag);
1907 flag_inv (tmp, flag); 1960 flag_inv (tmp, flag);
1908 } 1961 }
1909} 1962}
1910 1963
1911/* 1964/*
1912 * deactivate recursively a flag on an object inventory 1965 * deactivate recursively a flag on an object inventory
1913 */ 1966 */
1914void 1967void
1915unflag_inv (object *op, int flag) 1968unflag_inv (object *op, int flag)
1916{ 1969{
1917 if (op->inv)
1918 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1970 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919 { 1971 {
1920 CLEAR_FLAG (tmp, flag); 1972 CLEAR_FLAG (tmp, flag);
1921 unflag_inv (tmp, flag); 1973 unflag_inv (tmp, flag);
1922 } 1974 }
1923}
1924
1925/*
1926 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1927 * all it's inventory (recursively).
1928 * If checksums are used, a player will get set_cheat called for
1929 * him/her-self and all object carried by a call to this function.
1930 */
1931void
1932set_cheat (object *op)
1933{
1934 SET_FLAG (op, FLAG_WAS_WIZ);
1935 flag_inv (op, FLAG_WAS_WIZ);
1936} 1975}
1937 1976
1938/* 1977/*
1939 * 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
1940 * 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
… …
1942 * to search (see the freearr_x/y[] definition). 1981 * to search (see the freearr_x/y[] definition).
1943 * It returns a random choice among the alternatives found. 1982 * It returns a random choice among the alternatives found.
1944 * 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
1945 * does all 4 immediate directions). This returns the index into the 1984 * does all 4 immediate directions). This returns the index into the
1946 * 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)
1947 * Note - this only checks to see if there is space for the head of the
1948 * object - if it is a multispace object, this should be called for all
1949 * pieces.
1950 * Note2: This function does correctly handle tiled maps, but does not 1986 * Note: This function does correctly handle tiled maps, but does not
1951 * inform the caller. However, insert_ob_in_map will update as 1987 * inform the caller. However, insert_ob_in_map will update as
1952 * 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.
1953 * 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
1954 * 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
1955 * 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
… …
1957 * customized, changed states, etc. 1993 * customized, changed states, etc.
1958 */ 1994 */
1959int 1995int
1960find_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)
1961{ 1997{
1998 int altern[SIZEOFFREE];
1962 int index = 0, flag; 1999 int index = 0, flag;
1963 int altern[SIZEOFFREE];
1964 2000
1965 for (int i = start; i < stop; i++) 2001 for (int i = start; i < stop; i++)
1966 { 2002 {
1967 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2003 mapxy pos (m, x, y); pos.move (i);
1968 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 && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2018 {
1969 altern [index++] = i; 2019 altern [index++] = i;
2020 continue;
2021 }
1970 2022
1971 /* 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.
1972 * 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.
1973 * 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 -
1974 * 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
1975 * 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
1976 * to only the spaces immediately surrounding the target area, and 2028 * to only the spaces immediately surrounding the target area, and
1977 * won't look 2 spaces south of the target space. 2029 * won't look 2 spaces south of the target space.
1978 */ 2030 */
1979 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2031 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2032 {
1980 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;
1981 } 2047 }
1982 2048
1983 if (!index) 2049 if (!index)
1984 return -1; 2050 return -1;
1985 2051
… …
1994 */ 2060 */
1995int 2061int
1996find_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)
1997{ 2063{
1998 for (int i = 0; i < SIZEOFFREE; i++) 2064 for (int i = 0; i < SIZEOFFREE; i++)
1999 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]))
2000 return i; 2066 return i;
2001 2067
2002 return -1; 2068 return -1;
2003} 2069}
2004 2070
… …
2058 object *tmp; 2124 object *tmp;
2059 maptile *mp; 2125 maptile *mp;
2060 2126
2061 MoveType blocked, move_type; 2127 MoveType blocked, move_type;
2062 2128
2063 if (exclude && exclude->head) 2129 if (exclude && exclude->head_ () != exclude)
2064 { 2130 {
2065 exclude = exclude->head; 2131 exclude = exclude->head;
2066 move_type = exclude->move_type; 2132 move_type = exclude->move_type;
2067 } 2133 }
2068 else 2134 else
… …
2091 max = maxfree[i]; 2157 max = maxfree[i];
2092 else if (mflags & P_IS_ALIVE) 2158 else if (mflags & P_IS_ALIVE)
2093 { 2159 {
2094 for (tmp = ms.bot; tmp; tmp = tmp->above) 2160 for (tmp = ms.bot; tmp; tmp = tmp->above)
2095 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2161 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2096 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2162 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2097 break; 2163 break;
2098 2164
2099 if (tmp) 2165 if (tmp)
2100 return freedir[i]; 2166 return freedir[i];
2101 } 2167 }
… …
2281 * 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
2282 * core dumps if they do. 2348 * core dumps if they do.
2283 * 2349 *
2284 * 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)
2285 */ 2351 */
2286
2287int 2352int
2288can_pick (const object *who, const object *item) 2353can_pick (const object *who, const object *item)
2289{ 2354{
2290 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2355 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2291 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2356 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2296 * create clone from object to another 2361 * create clone from object to another
2297 */ 2362 */
2298object * 2363object *
2299object_create_clone (object *asrc) 2364object_create_clone (object *asrc)
2300{ 2365{
2301 object *dst = 0, *tmp, *src, *part, *prev, *item; 2366 object *dst = 0, *tmp, *src, *prev, *item;
2302 2367
2303 if (!asrc) 2368 if (!asrc)
2304 return 0; 2369 return 0;
2305 2370
2306 src = asrc;
2307 if (src->head)
2308 src = src->head; 2371 src = asrc->head_ ();
2309 2372
2310 prev = 0; 2373 prev = 0;
2311 for (part = src; part; part = part->more) 2374 for (object *part = src; part; part = part->more)
2312 { 2375 {
2313 tmp = part->clone (); 2376 tmp = part->clone ();
2314 tmp->x -= src->x; 2377 tmp->x -= src->x;
2315 tmp->y -= src->y; 2378 tmp->y -= src->y;
2316 2379
… …
2332 2395
2333 for (item = src->inv; item; item = item->below) 2396 for (item = src->inv; item; item = item->below)
2334 insert_ob_in_ob (object_create_clone (item), dst); 2397 insert_ob_in_ob (object_create_clone (item), dst);
2335 2398
2336 return dst; 2399 return dst;
2337}
2338
2339/* GROS - Creates an object using a string representing its content. */
2340/* Basically, we save the content of the string to a temp file, then call */
2341/* load_object on it. I admit it is a highly inefficient way to make things, */
2342/* but it was simple to make and allows reusing the load_object function. */
2343/* Remember not to use load_object_str in a time-critical situation. */
2344/* Also remember that multiparts objects are not supported for now. */
2345object *
2346load_object_str (const char *obstr)
2347{
2348 object *op;
2349 char filename[MAX_BUF];
2350
2351 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2352
2353 FILE *tempfile = fopen (filename, "w");
2354
2355 if (tempfile == NULL)
2356 {
2357 LOG (llevError, "Error - Unable to access load object temp file\n");
2358 return NULL;
2359 }
2360
2361 fprintf (tempfile, obstr);
2362 fclose (tempfile);
2363
2364 op = object::create ();
2365
2366 object_thawer thawer (filename);
2367
2368 if (thawer)
2369 load_object (thawer, op, 0);
2370
2371 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2372 CLEAR_FLAG (op, FLAG_REMOVED);
2373
2374 return op;
2375} 2400}
2376 2401
2377/* This returns the first object in who's inventory that 2402/* This returns the first object in who's inventory that
2378 * has the same type and subtype match. 2403 * has the same type and subtype match.
2379 * returns NULL if no match. 2404 * returns NULL if no match.
… …
2434 if (link->key == canonical_key) 2459 if (link->key == canonical_key)
2435 return link->value; 2460 return link->value;
2436 2461
2437 return 0; 2462 return 0;
2438} 2463}
2439
2440 2464
2441/* 2465/*
2442 * Updates the canonical_key in op to value. 2466 * Updates the canonical_key in op to value.
2443 * 2467 *
2444 * 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).
… …
2468 /* Basically, if the archetype has this key set, 2492 /* Basically, if the archetype has this key set,
2469 * we need to store the null value so when we save 2493 * we need to store the null value so when we save
2470 * it, we save the empty value so that when we load, 2494 * it, we save the empty value so that when we load,
2471 * we get this value back again. 2495 * we get this value back again.
2472 */ 2496 */
2473 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2497 if (get_ob_key_link (op->arch, canonical_key))
2474 field->value = 0; 2498 field->value = 0;
2475 else 2499 else
2476 { 2500 {
2477 if (last) 2501 if (last)
2478 last->next = field->next; 2502 last->next = field->next;
… …
2547 } 2571 }
2548 else 2572 else
2549 item = item->env; 2573 item = item->env;
2550} 2574}
2551 2575
2552
2553const char * 2576const char *
2554object::flag_desc (char *desc, int len) const 2577object::flag_desc (char *desc, int len) const
2555{ 2578{
2556 char *p = desc; 2579 char *p = desc;
2557 bool first = true; 2580 bool first = true;
… …
2591 &name, 2614 &name,
2592 title ? "\",title:\"" : "", 2615 title ? "\",title:\"" : "",
2593 title ? (const char *)title : "", 2616 title ? (const char *)title : "",
2594 flag_desc (flagdesc, 512), type); 2617 flag_desc (flagdesc, 512), type);
2595 2618
2596 if (env) 2619 if (!this->flag[FLAG_REMOVED] && env)
2597 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2598 2621
2599 if (map) 2622 if (map)
2600 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);
2601 2624
… …
2603} 2626}
2604 2627
2605const char * 2628const char *
2606object::debug_desc () const 2629object::debug_desc () const
2607{ 2630{
2608 static char info[256 * 4]; 2631 static char info[3][256 * 4];
2632 static int info_idx;
2633
2609 return debug_desc (info); 2634 return debug_desc (info [++info_idx % 3]);
2610}
2611
2612const char *
2613object::debug_desc2 () const
2614{
2615 static char info[256 * 4];
2616 return debug_desc (info);
2617} 2635}
2618 2636
2619struct region * 2637struct region *
2620object::region () const 2638object::region () const
2621{ 2639{
… …
2624} 2642}
2625 2643
2626const materialtype_t * 2644const materialtype_t *
2627object::dominant_material () const 2645object::dominant_material () const
2628{ 2646{
2629 if (materialtype_t *mat = name_to_material (materialname)) 2647 if (materialtype_t *mt = name_to_material (materialname))
2630 return mat; 2648 return mt;
2631 2649
2632 // omfg this is slow, this has to be temporary :)
2633 shstr unknown ("unknown");
2634
2635 return name_to_material (unknown); 2650 return name_to_material (shstr_unknown);
2636} 2651}
2637 2652
2638void 2653void
2639object::open_container (object *new_container) 2654object::open_container (object *new_container)
2640{ 2655{
2641 if (container == new_container) 2656 if (container == new_container)
2642 return; 2657 return;
2643
2644 if (contr && contr->ns)
2645 contr->ns->floorbox_reset ();
2646 2658
2647 if (object *old_container = container) 2659 if (object *old_container = container)
2648 { 2660 {
2649 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2661 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2650 return; 2662 return;
… …
2659 old_container->flag [FLAG_APPLIED] = 0; 2671 old_container->flag [FLAG_APPLIED] = 0;
2660 container = 0; 2672 container = 0;
2661 2673
2662 esrv_update_item (UPD_FLAGS, this, old_container); 2674 esrv_update_item (UPD_FLAGS, this, old_container);
2663 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"));
2664 } 2677 }
2665 2678
2666 if (new_container) 2679 if (new_container)
2667 { 2680 {
2668 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2681 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2677 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2690 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2678 new_container->insert (closer); 2691 new_container->insert (closer);
2679 } 2692 }
2680#endif 2693#endif
2681 2694
2695 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2696
2682 new_container->flag [FLAG_APPLIED] = 1; 2697 new_container->flag [FLAG_APPLIED] = 1;
2683 container = new_container; 2698 container = new_container;
2684 2699
2685 esrv_update_item (UPD_FLAGS, this, new_container); 2700 esrv_update_item (UPD_FLAGS, this, new_container);
2686 esrv_send_inventory (this, new_container); 2701 esrv_send_inventory (this, new_container);
2687 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (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)
2688 } 2748 {
2749 if (object *pl = in_player ())
2750 pl->contr->play_sound (sound);
2751 }
2752 else
2753 map->play_sound (sound, x, y);
2689} 2754}
2690 2755
2691

Diff Legend

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