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.87 by root, Tue Dec 26 08:54:59 2006 UTC vs.
Revision 1.163 by root, Sun Jul 1 05:00:17 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 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>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
27#include <global.h> 27#include <global.h>
28#include <stdio.h> 28#include <stdio.h>
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
33#include <loader.h> 34#include <loader.h>
34 35
35#include <bitset> 36#include <bitset>
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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, 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,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
190 * Check nrof variable *before* calling can_merge() 192 * Check nrof variable *before* calling can_merge()
191 * 193 *
192 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
193 * check weight 195 * check weight
194 */ 196 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
197{ 198{
198 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
199 if (ob1 == ob2 200 if (ob1 == ob2
200 || ob1->type != ob2->type 201 || ob1->type != ob2->type
277 278
278 /* Note sure why the following is the case - either the object has to 279 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 280 * be animated or have a very low speed. Is this an attempted monster
280 * check? 281 * check?
281 */ 282 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 284 return 0;
284 285
285 switch (ob1->type) 286 switch (ob1->type)
286 { 287 {
287 case SCROLL: 288 case SCROLL:
323sum_weight (object *op) 324sum_weight (object *op)
324{ 325{
325 long sum; 326 long sum;
326 object *inv; 327 object *inv;
327 328
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 330 {
330 if (inv->inv) 331 if (inv->inv)
331 sum_weight (inv); 332 sum_weight (inv);
333
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 335 }
334 336
335 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 358/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 360 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
360 */ 362 */
361
362char * 363char *
363dump_object (object *op) 364dump_object (object *op)
364{ 365{
365 if (!op) 366 if (!op)
366 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
367 368
368 object_freezer freezer; 369 object_freezer freezer;
369 save_object (freezer, op, 1); 370 op->write (freezer);
370 return freezer.as_string (); 371 return freezer.as_string ();
371} 372}
372 373
373/* 374/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
391} 392}
392 393
393/* 394/*
394 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
395 */ 396 */
396
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
401 if (op->count == i) 401 if (op->count == i)
402 return op; 402 return op;
403 403
404 return 0; 404 return 0;
405} 405}
406 406
407/* 407/*
408 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
411 */ 411 */
412
413object * 412object *
414find_object_name (const char *str) 413find_object_name (const char *str)
415{ 414{
416 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
417 object *op; 416 object *op;
418 417
419 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
420 if (op->name == str_) 419 if (op->name == str_)
421 break; 420 break;
422 421
423 return op; 422 return op;
424} 423}
450 owner = owner->owner; 449 owner = owner->owner;
451 450
452 this->owner = owner; 451 this->owner = owner;
453} 452}
454 453
454int
455object::slottype () const
456{
457 if (type == SKILL)
458 {
459 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
460 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
461 }
462 else
463 {
464 if (slot [body_combat].info) return slot_combat;
465 if (slot [body_range ].info) return slot_ranged;
466 }
467
468 return slot_none;
469}
470
471bool
472object::change_weapon (object *ob)
473{
474 if (current_weapon == ob)
475 return true;
476
477 if (chosen_skill)
478 chosen_skill->flag [FLAG_APPLIED] = false;
479
480 current_weapon = ob;
481 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
482
483 if (chosen_skill)
484 chosen_skill->flag [FLAG_APPLIED] = true;
485
486 update_stats ();
487
488 if (ob)
489 {
490 // now check wether any body locations became invalid, in which case
491 // we cannot apply the weapon at the moment.
492 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
493 if (slot[i].used < 0)
494 {
495 current_weapon = chosen_skill = 0;
496 update_stats ();
497
498 new_draw_info_format (NDI_UNIQUE, 0, this,
499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "[You need to unapply some items first.]", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
518}
519
455/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 521 * refcounts and freeing the links.
457 */ 522 */
458static void 523static void
459free_key_values (object *op) 524free_key_values (object *op)
460{ 525{
461 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
462 { 527 {
463 key_value *next = i->next; 528 key_value *next = i->next;
464 delete i; 529 delete i;
465 530
466 i = next; 531 i = next;
467 } 532 }
468 533
469 op->key_values = 0; 534 op->key_values = 0;
470} 535}
471 536
472/* 537object &
473 * copy_to first frees everything allocated by the dst object, 538object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 539{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 540 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 541 bool is_removed = flag [FLAG_REMOVED];
485 542
486 *(object_copy *)dst = *this; 543 *(object_copy *)this = src;
487 544
488 if (is_freed) 545 flag [FLAG_FREED] = is_freed;
489 SET_FLAG (dst, FLAG_FREED); 546 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED);
493
494 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496 547
497 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
498 if (key_values) 549 if (src.key_values)
499 { 550 {
500 key_value *tail = 0; 551 key_value *tail = 0;
501 key_value *i;
502
503 dst->key_values = 0; 552 key_values = 0;
504 553
505 for (i = key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
506 { 555 {
507 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
508 557
509 new_link->next = 0; 558 new_link->next = 0;
510 new_link->key = i->key; 559 new_link->key = i->key;
511 new_link->value = i->value; 560 new_link->value = i->value;
512 561
513 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
514 if (!dst->key_values) 563 if (!key_values)
515 { 564 {
516 dst->key_values = new_link; 565 key_values = new_link;
517 tail = new_link; 566 tail = new_link;
518 } 567 }
519 else 568 else
520 { 569 {
521 tail->next = new_link; 570 tail->next = new_link;
522 tail = new_link; 571 tail = new_link;
523 } 572 }
524 } 573 }
525 } 574 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
526 592
527 dst->set_speed (dst->speed); 593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
528} 613}
529 614
530object * 615object *
531object::clone () 616object::clone ()
532{ 617{
538/* 623/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 624 * If an object with the IS_TURNABLE() flag needs to be turned due
540 * to the closest player being on the other side, this function can 625 * to the closest player being on the other side, this function can
541 * be called to update the face variable, _and_ how it looks on the map. 626 * be called to update the face variable, _and_ how it looks on the map.
542 */ 627 */
543
544void 628void
545update_turn_face (object *op) 629update_turn_face (object *op)
546{ 630{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 631 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 632 return;
633
549 SET_ANIMATION (op, op->direction); 634 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 635 update_object (op, UP_OBJ_FACE);
551} 636}
552 637
553/* 638/*
556 * This function needs to be called whenever the speed of an object changes. 641 * This function needs to be called whenever the speed of an object changes.
557 */ 642 */
558void 643void
559object::set_speed (float speed) 644object::set_speed (float speed)
560{ 645{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed) 646 if (flag [FLAG_FREED] && speed)
567 { 647 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 648 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 649 speed = 0;
570 } 650 }
571 651
572 this->speed = speed; 652 this->speed = speed;
573 653
574 if (arch_init) 654 if (has_active_speed ())
575 return; 655 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 656 else
593 { 657 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 658}
648 659
649/* 660/*
650 * update_object() updates the the map. 661 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 662 * It takes into account invisible objects (and represent squares covered
664 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
665 */ 676 */
666void 677void
667update_object (object *op, int action) 678update_object (object *op, int action)
668{ 679{
669 MoveType move_on, move_off, move_block, move_slow;
670
671 if (op == NULL) 680 if (op == NULL)
672 { 681 {
673 /* this should never happen */ 682 /* this should never happen */
674 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
675 return; 684 return;
699 return; 708 return;
700 } 709 }
701 710
702 mapspace &m = op->ms (); 711 mapspace &m = op->ms ();
703 712
704 if (m.flags_ & P_NEED_UPDATE) 713 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 714 /* nop */;
706 else if (action == UP_OBJ_INSERT) 715 else if (action == UP_OBJ_INSERT)
707 { 716 {
708 // this is likely overkill, TODO: revisit (schmorp) 717 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 718 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
718 /* This isn't perfect, but I don't expect a lot of objects to 727 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 728 * to have move_allow right now.
720 */ 729 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 730 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 731 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723 m.flags_ = P_NEED_UPDATE; 732 m.flags_ = 0;
724 } 733 }
725 /* if the object is being removed, we can't make intelligent 734 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 735 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 736 * that is being removed.
728 */ 737 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 738 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 739 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 740 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 741 /* Nothing to do for that case */ ;
733 else 742 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 743 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 744
736 if (op->more) 745 if (op->more)
737 update_object (op->more, action); 746 update_object (op->more, action);
738} 747}
739 748
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 749object::object ()
744{ 750{
745 SET_FLAG (this, FLAG_REMOVED); 751 SET_FLAG (this, FLAG_REMOVED);
746 752
747 expmul = 1.0; 753 expmul = 1.0;
748 face = blank_face; 754 face = blank_face;
749} 755}
750 756
751object::~object () 757object::~object ()
752{ 758{
759 unlink ();
760
753 free_key_values (this); 761 free_key_values (this);
754} 762}
755 763
764static int object_count;
765
756void object::link () 766void object::link ()
757{ 767{
758 count = ++ob_count; 768 assert (!index);//D
759 uuid = gen_uuid (); 769 uuid = gen_uuid ();
770 count = ++object_count;
760 771
761 prev = 0; 772 refcnt_inc ();
762 next = object::first; 773 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 774}
769 775
770void object::unlink () 776void object::unlink ()
771{ 777{
772 if (this == object::first) 778 if (!index)
773 object::first = next;
774
775 /* Remove this object from the list of used objects */
776 if (prev) prev->next = next;
777 if (next) next->prev = prev;
778
779 prev = 0;
780 next = 0;
781}
782
783object *object::create ()
784{
785 object *op = new object;
786 op->link ();
787 return op; 779 return;
780
781 objects.erase (this);
782 refcnt_dec ();
788} 783}
789 784
790void 785void
791object::do_destroy () 786object::activate ()
792{ 787{
793 attachable::do_destroy (); 788 /* If already on active list, don't do anything */
794 789 if (active)
795 if (flag [FLAG_IS_LINKED])
796 remove_button_link (this);
797
798 if (flag [FLAG_FRIENDLY])
799 remove_friendly_object (this);
800
801 if (!flag [FLAG_REMOVED])
802 remove ();
803
804 if (flag [FLAG_FREED])
805 return; 790 return;
806 791
807 flag [FLAG_FREED] = 1; 792 if (has_active_speed ())
793 actives.insert (this);
794}
808 795
809 // hack to ensure that freed objects still have a valid map 796void
810 { 797object::activate_recursive ()
811 static maptile *freed_map; // freed objects are moved here to avoid crashes 798{
799 activate ();
812 800
813 if (!freed_map) 801 for (object *op = inv; op; op = op->below)
802 op->activate_recursive ();
803}
804
805/* This function removes object 'op' from the list of active
806 * objects.
807 * This should only be used for style maps or other such
808 * reference maps where you don't want an object that isn't
809 * in play chewing up cpu time getting processed.
810 * The reverse of this is to call update_ob_speed, which
811 * will do the right thing based on the speed of the object.
812 */
813void
814object::deactivate ()
815{
816 /* If not on the active list, nothing needs to be done */
817 if (!active)
818 return;
819
820 actives.erase (this);
821}
822
823void
824object::deactivate_recursive ()
825{
826 for (object *op = inv; op; op = op->below)
827 op->deactivate_recursive ();
828
829 deactivate ();
830}
831
832void
833object::set_flag_inv (int flag, int value)
834{
835 for (object *op = inv; op; op = op->below)
814 { 836 {
815 freed_map = new maptile; 837 op->flag [flag] = value;
816 838 op->set_flag_inv (flag, value);
817 freed_map->name = "/internal/freed_objects_map";
818 freed_map->width = 3;
819 freed_map->height = 3;
820
821 freed_map->allocate ();
822 } 839 }
823
824 map = freed_map;
825 x = 1;
826 y = 1;
827 }
828
829 more = 0;
830 head = 0;
831 inv = 0;
832
833 // clear those pointers that likely might have circular references to us
834 owner = 0;
835 enemy = 0;
836 attacked_by = 0;
837
838 // only relevant for players(?), but make sure of it anyways
839 contr = 0;
840
841 /* Remove object from the active list */
842 set_speed (0);
843
844 unlink ();
845} 840}
846 841
847/* 842/*
848 * Remove and free all objects in the inventory of the given object. 843 * Remove and free all objects in the inventory of the given object.
849 * object.c ? 844 * object.c ?
850 */ 845 */
851void 846void
852object::destroy_inv (bool drop_to_ground) 847object::destroy_inv (bool drop_to_ground)
853{ 848{
849 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory,
853 // cf will crash below with off-map x and y
854 if (!inv) 854 if (!inv)
855 return; 855 return;
856 856
857 /* Only if the space blocks everything do we not process - 857 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects 858 * if some form of movement is allowed, let objects
859 * drop on that space. 859 * drop on that space.
860 */ 860 */
861 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 861 if (!drop_to_ground
862 || !map
863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
865 || ms ().move_block == MOVE_ALL)
862 { 866 {
863 while (inv) 867 while (inv)
864 { 868 {
865 inv->destroy_inv (drop_to_ground); 869 inv->destroy_inv (drop_to_ground);
866 inv->destroy (); 870 inv->destroy ();
874 878
875 if (op->flag [FLAG_STARTEQUIP] 879 if (op->flag [FLAG_STARTEQUIP]
876 || op->flag [FLAG_NO_DROP] 880 || op->flag [FLAG_NO_DROP]
877 || op->type == RUNE 881 || op->type == RUNE
878 || op->type == TRAP 882 || op->type == TRAP
879 || op->flag [FLAG_IS_A_TEMPLATE]) 883 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH])
880 op->destroy (); 885 op->destroy ();
881 else 886 else
882 { 887 map->insert (op, x, y);
883 op->remove ();
884 op->x = x;
885 op->y = y;
886 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
887 }
888 } 888 }
889 } 889 }
890}
891
892object *object::create ()
893{
894 object *op = new object;
895 op->link ();
896 return op;
897}
898
899void
900object::do_destroy ()
901{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this);
906
907 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this);
909
910 if (!flag [FLAG_REMOVED])
911 remove ();
912
913 destroy_inv (true);
914
915 deactivate ();
916 unlink ();
917
918 flag [FLAG_FREED] = 1;
919
920 // hack to ensure that freed objects still have a valid map
921 {
922 static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924 if (!freed_map)
925 {
926 freed_map = new maptile;
927
928 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3;
930 freed_map->height = 3;
931
932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
934 }
935
936 map = freed_map;
937 x = 1;
938 y = 1;
939 }
940
941 if (more)
942 {
943 more->destroy ();
944 more = 0;
945 }
946
947 head = 0;
948
949 // clear those pointers that likely might cause circular references
950 owner = 0;
951 enemy = 0;
952 attacked_by = 0;
953 current_weapon = 0;
890} 954}
891 955
892void 956void
893object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
894{ 958{
895 if (destroyed ()) 959 if (destroyed ())
896 return; 960 return;
897 961
898 if (more)
899 {
900 //TODO: non-head objects must not have inventory
901 more->destroy (destroy_inventory);
902 more = 0;
903 }
904
905 if (destroy_inventory) 962 if (destroy_inventory)
906 destroy_inv (true); 963 destroy_inv (false);
907 964
908 attachable::destroy (); 965 attachable::destroy ();
909} 966}
910 967
911/* 968/*
929 * This function removes the object op from the linked list of objects 986 * This function removes the object op from the linked list of objects
930 * which it is currently tied to. When this function is done, the 987 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 988 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 989 * environment, the x and y coordinates will be updated to
933 * the previous environment. 990 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 991 */
936void 992void
937object::remove () 993object::do_remove ()
938{ 994{
939 object *tmp, *last = 0; 995 object *tmp, *last = 0;
940 object *otmp; 996 object *otmp;
941 997
942 if (QUERY_FLAG (this, FLAG_REMOVED)) 998 if (QUERY_FLAG (this, FLAG_REMOVED))
964 * to save cpu time. 1020 * to save cpu time.
965 */ 1021 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1022 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats (); 1023 otmp->update_stats ();
968 1024
969 if (above != NULL) 1025 if (above)
970 above->below = below; 1026 above->below = below;
971 else 1027 else
972 env->inv = below; 1028 env->inv = below;
973 1029
974 if (below != NULL) 1030 if (below)
975 below->above = above; 1031 below->above = above;
976 1032
977 /* we set up values so that it could be inserted into 1033 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up 1034 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do. 1035 * to the caller to decide what we want to do.
983 above = 0, below = 0; 1039 above = 0, below = 0;
984 env = 0; 1040 env = 0;
985 } 1041 }
986 else if (map) 1042 else if (map)
987 { 1043 {
988 /* Re did the following section of code - it looks like it had 1044 if (type == PLAYER)
989 * lots of logic for things we no longer care about
990 */ 1045 {
1046 // leaving a spot always closes any open container on the ground
1047 if (container && !container->env)
1048 // this causes spurious floorbox updates, but it ensures
1049 // that the CLOSE event is being sent.
1050 close_container ();
1051
1052 --map->players;
1053 map->touch ();
1054 }
1055
1056 map->dirty = true;
1057 mapspace &ms = this->ms ();
991 1058
992 /* link the object above us */ 1059 /* link the object above us */
993 if (above) 1060 if (above)
994 above->below = below; 1061 above->below = below;
995 else 1062 else
996 map->at (x, y).top = below; /* we were top, set new top */ 1063 ms.top = below; /* we were top, set new top */
997 1064
998 /* Relink the object below us, if there is one */ 1065 /* Relink the object below us, if there is one */
999 if (below) 1066 if (below)
1000 below->above = above; 1067 below->above = above;
1001 else 1068 else
1003 /* Nothing below, which means we need to relink map object for this space 1070 /* Nothing below, which means we need to relink map object for this space
1004 * use translated coordinates in case some oddness with map tiling is 1071 * use translated coordinates in case some oddness with map tiling is
1005 * evident 1072 * evident
1006 */ 1073 */
1007 if (GET_MAP_OB (map, x, y) != this) 1074 if (GET_MAP_OB (map, x, y) != this)
1008 {
1009 char *dump = dump_object (this);
1010 LOG (llevError,
1011 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1075 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1012 free (dump);
1013 dump = dump_object (GET_MAP_OB (map, x, y));
1014 LOG (llevError, "%s\n", dump);
1015 free (dump);
1016 }
1017 1076
1018 map->at (x, y).bot = above; /* goes on above it. */ 1077 ms.bot = above; /* goes on above it. */
1019 } 1078 }
1020 1079
1021 above = 0; 1080 above = 0;
1022 below = 0; 1081 below = 0;
1023 1082
1024 if (map->in_memory == MAP_SAVING) 1083 if (map->in_memory == MAP_SAVING)
1025 return; 1084 return;
1026 1085
1027 int check_walk_off = !flag [FLAG_NO_APPLY]; 1086 int check_walk_off = !flag [FLAG_NO_APPLY];
1028 1087
1029 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1088 for (tmp = ms.bot; tmp; tmp = tmp->above)
1030 { 1089 {
1031 /* No point updating the players look faces if he is the object 1090 /* No point updating the players look faces if he is the object
1032 * being removed. 1091 * being removed.
1033 */ 1092 */
1034 1093
1046 1105
1047 if (tmp->contr->ns) 1106 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update (); 1107 tmp->contr->ns->floorbox_update ();
1049 } 1108 }
1050 1109
1051 /* See if player moving off should effect something */ 1110 /* See if object moving off should effect something */
1052 if (check_walk_off 1111 if (check_walk_off
1053 && ((move_type & tmp->move_off) 1112 && ((move_type & tmp->move_off)
1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055 { 1114 {
1056 move_apply (tmp, this, 0); 1115 move_apply (tmp, this, 0);
1057 1116
1058 if (destroyed ()) 1117 if (destroyed ())
1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060 } 1119 }
1061 1120
1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063
1064 if (tmp->above == tmp)
1065 tmp->above = 0;
1066
1067 last = tmp; 1121 last = tmp;
1068 } 1122 }
1069 1123
1070 /* last == NULL of there are no objects on this space */ 1124 /* last == NULL if there are no objects on this space */
1125 //TODO: this makes little sense, why only update the topmost object?
1071 if (!last) 1126 if (!last)
1072 map->at (x, y).flags_ = P_NEED_UPDATE; 1127 map->at (x, y).flags_ = 0;
1073 else 1128 else
1074 update_object (last, UP_OBJ_REMOVE); 1129 update_object (last, UP_OBJ_REMOVE);
1075 1130
1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1131 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077 update_all_los (map, x, y); 1132 update_all_los (map, x, y);
1113 } 1168 }
1114 1169
1115 return 0; 1170 return 0;
1116} 1171}
1117 1172
1173void
1174object::expand_tail ()
1175{
1176 if (more)
1177 return;
1178
1179 object *prev = this;
1180
1181 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1182 {
1183 object *op = arch_to_object (at);
1184
1185 op->name = name;
1186 op->name_pl = name_pl;
1187 op->title = title;
1188
1189 op->head = this;
1190 prev->more = op;
1191
1192 prev = op;
1193 }
1194}
1195
1118/* 1196/*
1119 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1197 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1120 * job preparing multi-part monsters 1198 * job preparing multi-part monsters.
1121 */ 1199 */
1122object * 1200object *
1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1201insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124{ 1202{
1125 object *tmp;
1126
1127 if (op->head)
1128 op = op->head;
1129
1130 for (tmp = op; tmp; tmp = tmp->more) 1203 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131 { 1204 {
1132 tmp->x = x + tmp->arch->clone.x; 1205 tmp->x = x + tmp->arch->x;
1133 tmp->y = y + tmp->arch->clone.y; 1206 tmp->y = y + tmp->arch->y;
1134 } 1207 }
1135 1208
1136 return insert_ob_in_map (op, m, originator, flag); 1209 return insert_ob_in_map (op, m, originator, flag);
1137} 1210}
1138 1211
1157 * just 'op' otherwise 1230 * just 'op' otherwise
1158 */ 1231 */
1159object * 1232object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1233insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1234{
1235 assert (!op->flag [FLAG_FREED]);
1236
1162 object *tmp, *top, *floor = NULL; 1237 object *top, *floor = NULL;
1163 sint16 x, y;
1164 1238
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1239 op->remove ();
1166 {
1167 LOG (llevError, "Trying to insert freed object!\n");
1168 return NULL;
1169 }
1170 1240
1171 if (m == NULL) 1241#if 0
1172 { 1242 if (!m->active != !op->active)
1173 char *dump = dump_object (op); 1243 if (m->active)
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1244 op->activate_recursive ();
1175 free (dump); 1245 else
1176 return op; 1246 op->deactivate_recursive ();
1177 } 1247#endif
1178 1248
1179 if (out_of_map (m, op->x, op->y)) 1249 if (out_of_map (m, op->x, op->y))
1180 { 1250 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1251 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1183#ifdef MANY_CORES 1252#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object 1253 /* Better to catch this here, as otherwise the next use of this object
1185 * is likely to cause a crash. Better to find out where it is getting 1254 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted. 1255 * improperly inserted.
1187 */ 1256 */
1188 abort (); 1257 abort ();
1189#endif 1258#endif
1190 free (dump);
1191 return op; 1259 return op;
1192 } 1260 }
1193 1261
1194 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1262 if (object *more = op->more)
1195 { 1263 if (!insert_ob_in_map (more, m, originator, flag))
1196 char *dump = dump_object (op);
1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1199 return op; 1264 return 0;
1200 }
1201
1202 if (op->more)
1203 {
1204 /* The part may be on a different map. */
1205
1206 object *more = op->more;
1207
1208 /* We really need the caller to normalize coordinates - if
1209 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it.
1212 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map)
1216 {
1217 /* For backwards compatibility - when not dealing with tiled maps,
1218 * more->map should always point to the parent.
1219 */
1220 more->map = m;
1221 }
1222
1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1224 {
1225 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228 return 0;
1229 }
1230 }
1231 1265
1232 CLEAR_FLAG (op, FLAG_REMOVED); 1266 CLEAR_FLAG (op, FLAG_REMOVED);
1233 1267
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1268 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * of areas of callers (eg, anything that uses find_free_spot would now 1269 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1270 * need extra work
1237 */ 1271 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1272 if (!xy_normalise (m, op->x, op->y))
1239 x = op->x; 1273 return 0;
1240 y = op->y; 1274
1275 op->map = m;
1276 mapspace &ms = op->ms ();
1241 1277
1242 /* this has to be done after we translate the coordinates. 1278 /* this has to be done after we translate the coordinates.
1243 */ 1279 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1280 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1281 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1282 if (object::can_merge (op, tmp))
1247 { 1283 {
1248 op->nrof += tmp->nrof; 1284 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1285 tmp->destroy ();
1250 } 1286 }
1267 op->below = originator->below; 1303 op->below = originator->below;
1268 1304
1269 if (op->below) 1305 if (op->below)
1270 op->below->above = op; 1306 op->below->above = op;
1271 else 1307 else
1272 op->ms ().bot = op; 1308 ms.bot = op;
1273 1309
1274 /* since *below* originator, no need to update top */ 1310 /* since *below* originator, no need to update top */
1275 originator->below = op; 1311 originator->below = op;
1276 } 1312 }
1277 else 1313 else
1278 { 1314 {
1315 top = ms.bot;
1316
1279 /* If there are other objects, then */ 1317 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1318 if ((!(flag & INS_MAP_LOAD)) && top)
1281 { 1319 {
1282 object *last = NULL; 1320 object *last = 0;
1283 1321
1284 /* 1322 /*
1285 * If there are multiple objects on this space, we do some trickier handling. 1323 * If there are multiple objects on this space, we do some trickier handling.
1286 * We've already dealt with merging if appropriate. 1324 * We've already dealt with merging if appropriate.
1287 * Generally, we want to put the new object on top. But if 1325 * Generally, we want to put the new object on top. But if
1291 * once we get to them. This reduces the need to traverse over all of 1329 * once we get to them. This reduces the need to traverse over all of
1292 * them when adding another one - this saves quite a bit of cpu time 1330 * them when adding another one - this saves quite a bit of cpu time
1293 * when lots of spells are cast in one area. Currently, it is presumed 1331 * when lots of spells are cast in one area. Currently, it is presumed
1294 * that flying non pickable objects are spell objects. 1332 * that flying non pickable objects are spell objects.
1295 */ 1333 */
1296 1334 for (top = ms.bot; top; top = top->above)
1297 while (top != NULL)
1298 { 1335 {
1299 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1336 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1300 floor = top; 1337 floor = top;
1301 1338
1302 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1339 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1305 top = top->below; 1342 top = top->below;
1306 break; 1343 break;
1307 } 1344 }
1308 1345
1309 last = top; 1346 last = top;
1310 top = top->above;
1311 } 1347 }
1312 1348
1313 /* Don't want top to be NULL, so set it to the last valid object */ 1349 /* Don't want top to be NULL, so set it to the last valid object */
1314 top = last; 1350 top = last;
1315 1351
1317 * looks like instead of lots of conditions here. 1353 * looks like instead of lots of conditions here.
1318 * makes things faster, and effectively the same result. 1354 * makes things faster, and effectively the same result.
1319 */ 1355 */
1320 1356
1321 /* Have object 'fall below' other objects that block view. 1357 /* Have object 'fall below' other objects that block view.
1322 * Unless those objects are exits, type 66 1358 * Unless those objects are exits.
1323 * If INS_ON_TOP is used, don't do this processing 1359 * If INS_ON_TOP is used, don't do this processing
1324 * Need to find the object that in fact blocks view, otherwise 1360 * Need to find the object that in fact blocks view, otherwise
1325 * stacking is a bit odd. 1361 * stacking is a bit odd.
1326 */ 1362 */
1327 if (!(flag & INS_ON_TOP) && 1363 if (!(flag & INS_ON_TOP)
1328 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1364 && ms.flags () & P_BLOCKSVIEW
1365 && (op->face && !faces [op->face].visibility))
1329 { 1366 {
1330 for (last = top; last != floor; last = last->below) 1367 for (last = top; last != floor; last = last->below)
1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1368 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1332 break; 1369 break;
1370
1333 /* Check to see if we found the object that blocks view, 1371 /* Check to see if we found the object that blocks view,
1334 * and make sure we have a below pointer for it so that 1372 * and make sure we have a below pointer for it so that
1335 * we can get inserted below this one, which requires we 1373 * we can get inserted below this one, which requires we
1336 * set top to the object below us. 1374 * set top to the object below us.
1337 */ 1375 */
1339 top = last->below; 1377 top = last->below;
1340 } 1378 }
1341 } /* If objects on this space */ 1379 } /* If objects on this space */
1342 1380
1343 if (flag & INS_MAP_LOAD) 1381 if (flag & INS_MAP_LOAD)
1344 top = GET_MAP_TOP (op->map, op->x, op->y); 1382 top = ms.top;
1345 1383
1346 if (flag & INS_ABOVE_FLOOR_ONLY) 1384 if (flag & INS_ABOVE_FLOOR_ONLY)
1347 top = floor; 1385 top = floor;
1348 1386
1349 /* Top is the object that our object (op) is going to get inserted above. 1387 /* Top is the object that our object (op) is going to get inserted above.
1350 */ 1388 */
1351 1389
1352 /* First object on this space */ 1390 /* First object on this space */
1353 if (!top) 1391 if (!top)
1354 { 1392 {
1355 op->above = GET_MAP_OB (op->map, op->x, op->y); 1393 op->above = ms.bot;
1356 1394
1357 if (op->above) 1395 if (op->above)
1358 op->above->below = op; 1396 op->above->below = op;
1359 1397
1360 op->below = NULL; 1398 op->below = 0;
1361 op->ms ().bot = op; 1399 ms.bot = op;
1362 } 1400 }
1363 else 1401 else
1364 { /* get inserted into the stack above top */ 1402 { /* get inserted into the stack above top */
1365 op->above = top->above; 1403 op->above = top->above;
1366 1404
1369 1407
1370 op->below = top; 1408 op->below = top;
1371 top->above = op; 1409 top->above = op;
1372 } 1410 }
1373 1411
1374 if (op->above == NULL) 1412 if (!op->above)
1375 op->ms ().top = op; 1413 ms.top = op;
1376 } /* else not INS_BELOW_ORIGINATOR */ 1414 } /* else not INS_BELOW_ORIGINATOR */
1377 1415
1378 if (op->type == PLAYER) 1416 if (op->type == PLAYER)
1417 {
1379 op->contr->do_los = 1; 1418 op->contr->do_los = 1;
1419 ++op->map->players;
1420 op->map->touch ();
1421 }
1422
1423 op->map->dirty = true;
1380 1424
1381 /* If we have a floor, we know the player, if any, will be above 1425 /* If we have a floor, we know the player, if any, will be above
1382 * it, so save a few ticks and start from there. 1426 * it, so save a few ticks and start from there.
1383 */ 1427 */
1384 if (!(flag & INS_MAP_LOAD)) 1428 if (!(flag & INS_MAP_LOAD))
1385 if (object *pl = op->ms ().player ()) 1429 if (object *pl = ms.player ())
1386 if (pl->contr->ns) 1430 if (pl->contr->ns)
1387 pl->contr->ns->floorbox_update (); 1431 pl->contr->ns->floorbox_update ();
1388 1432
1389 /* If this object glows, it may affect lighting conditions that are 1433 /* If this object glows, it may affect lighting conditions that are
1390 * visible to others on this map. But update_all_los is really 1434 * visible to others on this map. But update_all_los is really
1391 * an inefficient way to do this, as it means los for all players 1435 * an inefficient way to do this, as it means los for all players
1392 * on the map will get recalculated. The players could very well 1436 * on the map will get recalculated. The players could very well
1393 * be far away from this change and not affected in any way - 1437 * be far away from this change and not affected in any way -
1394 * this should get redone to only look for players within range, 1438 * this should get redone to only look for players within range,
1395 * or just updating the P_NEED_UPDATE for spaces within this area 1439 * or just updating the P_UPTODATE for spaces within this area
1396 * of effect may be sufficient. 1440 * of effect may be sufficient.
1397 */ 1441 */
1398 if (op->map->darkness && (op->glow_radius != 0)) 1442 if (op->map->darkness && (op->glow_radius != 0))
1399 update_all_los (op->map, op->x, op->y); 1443 update_all_los (op->map, op->x, op->y);
1400 1444
1411 * blocked() and wall() work properly), and these flags are updated by 1455 * blocked() and wall() work properly), and these flags are updated by
1412 * update_object(). 1456 * update_object().
1413 */ 1457 */
1414 1458
1415 /* if this is not the head or flag has been passed, don't check walk on status */ 1459 /* if this is not the head or flag has been passed, don't check walk on status */
1416 if (!(flag & INS_NO_WALK_ON) && !op->head) 1460 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1417 { 1461 {
1418 if (check_move_on (op, originator)) 1462 if (check_move_on (op, originator))
1419 return 0; 1463 return 0;
1420 1464
1421 /* If we are a multi part object, lets work our way through the check 1465 /* If we are a multi part object, lets work our way through the check
1422 * walk on's. 1466 * walk on's.
1423 */ 1467 */
1424 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1468 for (object *tmp = op->more; tmp; tmp = tmp->more)
1425 if (check_move_on (tmp, originator)) 1469 if (check_move_on (tmp, originator))
1426 return 0; 1470 return 0;
1427 } 1471 }
1428 1472
1429 return op; 1473 return op;
1438{ 1482{
1439 object *tmp, *tmp1; 1483 object *tmp, *tmp1;
1440 1484
1441 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1442 1486
1443 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1445 tmp->destroy (); 1489 tmp->destroy ();
1446 1490
1447 tmp1 = arch_to_object (archetype::find (arch_string)); 1491 tmp1 = arch_to_object (archetype::find (arch_string));
1448 1492
1449 tmp1->x = op->x; 1493 tmp1->x = op->x;
1450 tmp1->y = op->y; 1494 tmp1->y = op->y;
1451 insert_ob_in_map (tmp1, op->map, op, 0); 1495 insert_ob_in_map (tmp1, op->map, op, 0);
1496}
1497
1498object *
1499object::insert_at (object *where, object *originator, int flags)
1500{
1501 return where->map->insert (this, where->x, where->y, originator, flags);
1452} 1502}
1453 1503
1454/* 1504/*
1455 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1505 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1456 * is returned contains nr objects, and the remaining parts contains 1506 * is returned contains nr objects, and the remaining parts contains
1457 * the rest (or is removed and freed if that number is 0). 1507 * the rest (or is removed and freed if that number is 0).
1458 * On failure, NULL is returned, and the reason put into the 1508 * On failure, NULL is returned, and the reason put into the
1459 * global static errmsg array. 1509 * global static errmsg array.
1460 */ 1510 */
1461
1462object * 1511object *
1463get_split_ob (object *orig_ob, uint32 nr) 1512get_split_ob (object *orig_ob, uint32 nr)
1464{ 1513{
1465 object *newob; 1514 object *newob;
1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1515 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497 * the amount of an object. If the amount reaches 0, the object 1546 * the amount of an object. If the amount reaches 0, the object
1498 * is subsequently removed and freed. 1547 * is subsequently removed and freed.
1499 * 1548 *
1500 * Return value: 'op' if something is left, NULL if the amount reached 0 1549 * Return value: 'op' if something is left, NULL if the amount reached 0
1501 */ 1550 */
1502
1503object * 1551object *
1504decrease_ob_nr (object *op, uint32 i) 1552decrease_ob_nr (object *op, uint32 i)
1505{ 1553{
1506 object *tmp; 1554 object *tmp;
1507 1555
1582 1630
1583/* 1631/*
1584 * add_weight(object, weight) adds the specified weight to an object, 1632 * add_weight(object, weight) adds the specified weight to an object,
1585 * and also updates how much the environment(s) is/are carrying. 1633 * and also updates how much the environment(s) is/are carrying.
1586 */ 1634 */
1587
1588void 1635void
1589add_weight (object *op, signed long weight) 1636add_weight (object *op, signed long weight)
1590{ 1637{
1591 while (op != NULL) 1638 while (op != NULL)
1592 { 1639 {
1607 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1654 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1608 free (dump); 1655 free (dump);
1609 return op; 1656 return op;
1610 } 1657 }
1611 1658
1612 if (where->head) 1659 if (where->head_ () != where)
1613 { 1660 {
1614 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1661 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1615 where = where->head; 1662 where = where->head;
1616 } 1663 }
1617 1664
1618 return where->insert (op); 1665 return where->insert (op);
1619} 1666}
1624 * inside the object environment. 1671 * inside the object environment.
1625 * 1672 *
1626 * The function returns now pointer to inserted item, and return value can 1673 * The function returns now pointer to inserted item, and return value can
1627 * be != op, if items are merged. -Tero 1674 * be != op, if items are merged. -Tero
1628 */ 1675 */
1629
1630object * 1676object *
1631object::insert (object *op) 1677object::insert (object *op)
1632{ 1678{
1633 object *tmp, *otmp; 1679 object *tmp, *otmp;
1634 1680
1730 * 1776 *
1731 * MSW 2001-07-08: Check all objects on space, not just those below 1777 * MSW 2001-07-08: Check all objects on space, not just those below
1732 * object being inserted. insert_ob_in_map may not put new objects 1778 * object being inserted. insert_ob_in_map may not put new objects
1733 * on top. 1779 * on top.
1734 */ 1780 */
1735
1736int 1781int
1737check_move_on (object *op, object *originator) 1782check_move_on (object *op, object *originator)
1738{ 1783{
1739 object *tmp; 1784 object *tmp;
1740 maptile *m = op->map; 1785 maptile *m = op->map;
1767 1812
1768 /* The objects have to be checked from top to bottom. 1813 /* The objects have to be checked from top to bottom.
1769 * Hence, we first go to the top: 1814 * Hence, we first go to the top:
1770 */ 1815 */
1771 1816
1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1817 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1773 { 1818 {
1774 /* Trim the search when we find the first other spell effect 1819 /* Trim the search when we find the first other spell effect
1775 * this helps performance so that if a space has 50 spell objects, 1820 * this helps performance so that if a space has 50 spell objects,
1776 * we don't need to check all of them. 1821 * we don't need to check all of them.
1777 */ 1822 */
1795 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1840 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1796 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1841 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1797 { 1842 {
1798 1843
1799 float 1844 float
1800 diff = tmp->move_slow_penalty * FABS (op->speed); 1845 diff = tmp->move_slow_penalty * fabs (op->speed);
1801 1846
1802 if (op->type == PLAYER) 1847 if (op->type == PLAYER)
1803 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1848 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1804 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1849 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1805 diff /= 4.0; 1850 diff /= 4.0;
1835 * The first matching object is returned, or NULL if none. 1880 * The first matching object is returned, or NULL if none.
1836 */ 1881 */
1837object * 1882object *
1838present_arch (const archetype *at, maptile *m, int x, int y) 1883present_arch (const archetype *at, maptile *m, int x, int y)
1839{ 1884{
1840 if (m == NULL || out_of_map (m, x, y)) 1885 if (!m || out_of_map (m, x, y))
1841 { 1886 {
1842 LOG (llevError, "Present_arch called outside map.\n"); 1887 LOG (llevError, "Present_arch called outside map.\n");
1843 return NULL; 1888 return NULL;
1844 } 1889 }
1845 1890
1846 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1891 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1847 if (tmp->arch == at) 1892 if (tmp->arch == at)
1848 return tmp; 1893 return tmp;
1849 1894
1850 return NULL; 1895 return NULL;
1851} 1896}
1862 { 1907 {
1863 LOG (llevError, "Present called outside map.\n"); 1908 LOG (llevError, "Present called outside map.\n");
1864 return NULL; 1909 return NULL;
1865 } 1910 }
1866 1911
1867 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1912 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1868 if (tmp->type == type) 1913 if (tmp->type == type)
1869 return tmp; 1914 return tmp;
1870 1915
1871 return NULL; 1916 return NULL;
1872} 1917}
1949 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1994 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1950 { 1995 {
1951 CLEAR_FLAG (tmp, flag); 1996 CLEAR_FLAG (tmp, flag);
1952 unflag_inv (tmp, flag); 1997 unflag_inv (tmp, flag);
1953 } 1998 }
1954}
1955
1956/*
1957 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1958 * all it's inventory (recursively).
1959 * If checksums are used, a player will get set_cheat called for
1960 * him/her-self and all object carried by a call to this function.
1961 */
1962void
1963set_cheat (object *op)
1964{
1965 SET_FLAG (op, FLAG_WAS_WIZ);
1966 flag_inv (op, FLAG_WAS_WIZ);
1967} 1999}
1968 2000
1969/* 2001/*
1970 * find_free_spot(object, map, x, y, start, stop) will search for 2002 * find_free_spot(object, map, x, y, start, stop) will search for
1971 * a spot at the given map and coordinates which will be able to contain 2003 * a spot at the given map and coordinates which will be able to contain
2012 } 2044 }
2013 2045
2014 if (!index) 2046 if (!index)
2015 return -1; 2047 return -1;
2016 2048
2017 return altern[RANDOM () % index]; 2049 return altern [rndm (index)];
2018} 2050}
2019 2051
2020/* 2052/*
2021 * find_first_free_spot(archetype, maptile, x, y) works like 2053 * find_first_free_spot(archetype, maptile, x, y) works like
2022 * find_free_spot(), but it will search max number of squares. 2054 * find_free_spot(), but it will search max number of squares.
2043{ 2075{
2044 arr += begin; 2076 arr += begin;
2045 end -= begin; 2077 end -= begin;
2046 2078
2047 while (--end) 2079 while (--end)
2048 swap (arr [end], arr [RANDOM () % (end + 1)]); 2080 swap (arr [end], arr [rndm (end + 1)]);
2049} 2081}
2050 2082
2051/* new function to make monster searching more efficient, and effective! 2083/* new function to make monster searching more efficient, and effective!
2052 * This basically returns a randomized array (in the passed pointer) of 2084 * This basically returns a randomized array (in the passed pointer) of
2053 * the spaces to find monsters. In this way, it won't always look for 2085 * the spaces to find monsters. In this way, it won't always look for
2089 object *tmp; 2121 object *tmp;
2090 maptile *mp; 2122 maptile *mp;
2091 2123
2092 MoveType blocked, move_type; 2124 MoveType blocked, move_type;
2093 2125
2094 if (exclude && exclude->head) 2126 if (exclude && exclude->head_ () != exclude)
2095 { 2127 {
2096 exclude = exclude->head; 2128 exclude = exclude->head;
2097 move_type = exclude->move_type; 2129 move_type = exclude->move_type;
2098 } 2130 }
2099 else 2131 else
2122 max = maxfree[i]; 2154 max = maxfree[i];
2123 else if (mflags & P_IS_ALIVE) 2155 else if (mflags & P_IS_ALIVE)
2124 { 2156 {
2125 for (tmp = ms.bot; tmp; tmp = tmp->above) 2157 for (tmp = ms.bot; tmp; tmp = tmp->above)
2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2127 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2159 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128 break; 2160 break;
2129 2161
2130 if (tmp) 2162 if (tmp)
2131 return freedir[i]; 2163 return freedir[i];
2132 } 2164 }
2187 2219
2188 return 3; 2220 return 3;
2189} 2221}
2190 2222
2191/* 2223/*
2192 * absdir(int): Returns a number between 1 and 8, which represent
2193 * the "absolute" direction of a number (it actually takes care of
2194 * "overflow" in previous calculations of a direction).
2195 */
2196
2197int
2198absdir (int d)
2199{
2200 while (d < 1)
2201 d += 8;
2202
2203 while (d > 8)
2204 d -= 8;
2205
2206 return d;
2207}
2208
2209/*
2210 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2211 * between two directions (which are expected to be absolute (see absdir()) 2225 * between two directions (which are expected to be absolute (see absdir())
2212 */ 2226 */
2213
2214int 2227int
2215dirdiff (int dir1, int dir2) 2228dirdiff (int dir1, int dir2)
2216{ 2229{
2217 int d; 2230 int d;
2218 2231
2346 * create clone from object to another 2359 * create clone from object to another
2347 */ 2360 */
2348object * 2361object *
2349object_create_clone (object *asrc) 2362object_create_clone (object *asrc)
2350{ 2363{
2351 object *dst = 0, *tmp, *src, *part, *prev, *item; 2364 object *dst = 0, *tmp, *src, *prev, *item;
2352 2365
2353 if (!asrc) 2366 if (!asrc)
2354 return 0; 2367 return 0;
2355 2368
2356 src = asrc;
2357 if (src->head)
2358 src = src->head; 2369 src = asrc->head_ ();
2359 2370
2360 prev = 0; 2371 prev = 0;
2361 for (part = src; part; part = part->more) 2372 for (object *part = src; part; part = part->more)
2362 { 2373 {
2363 tmp = part->clone (); 2374 tmp = part->clone ();
2364 tmp->x -= src->x; 2375 tmp->x -= src->x;
2365 tmp->y -= src->y; 2376 tmp->y -= src->y;
2366 2377
2384 insert_ob_in_ob (object_create_clone (item), dst); 2395 insert_ob_in_ob (object_create_clone (item), dst);
2385 2396
2386 return dst; 2397 return dst;
2387} 2398}
2388 2399
2389/* GROS - Creates an object using a string representing its content. */
2390/* Basically, we save the content of the string to a temp file, then call */
2391/* load_object on it. I admit it is a highly inefficient way to make things, */
2392/* but it was simple to make and allows reusing the load_object function. */
2393/* Remember not to use load_object_str in a time-critical situation. */
2394/* Also remember that multiparts objects are not supported for now. */
2395object *
2396load_object_str (const char *obstr)
2397{
2398 object *op;
2399 char filename[MAX_BUF];
2400
2401 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2402
2403 FILE *tempfile = fopen (filename, "w");
2404
2405 if (tempfile == NULL)
2406 {
2407 LOG (llevError, "Error - Unable to access load object temp file\n");
2408 return NULL;
2409 }
2410
2411 fprintf (tempfile, obstr);
2412 fclose (tempfile);
2413
2414 op = object::create ();
2415
2416 object_thawer thawer (filename);
2417
2418 if (thawer)
2419 load_object (thawer, op, 0);
2420
2421 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2422 CLEAR_FLAG (op, FLAG_REMOVED);
2423
2424 return op;
2425}
2426
2427/* This returns the first object in who's inventory that 2400/* This returns the first object in who's inventory that
2428 * has the same type and subtype match. 2401 * has the same type and subtype match.
2429 * returns NULL if no match. 2402 * returns NULL if no match.
2430 */ 2403 */
2431object * 2404object *
2484 if (link->key == canonical_key) 2457 if (link->key == canonical_key)
2485 return link->value; 2458 return link->value;
2486 2459
2487 return 0; 2460 return 0;
2488} 2461}
2489
2490 2462
2491/* 2463/*
2492 * Updates the canonical_key in op to value. 2464 * Updates the canonical_key in op to value.
2493 * 2465 *
2494 * canonical_key is a shared string (value doesn't have to be). 2466 * canonical_key is a shared string (value doesn't have to be).
2518 /* Basically, if the archetype has this key set, 2490 /* Basically, if the archetype has this key set,
2519 * we need to store the null value so when we save 2491 * we need to store the null value so when we save
2520 * it, we save the empty value so that when we load, 2492 * it, we save the empty value so that when we load,
2521 * we get this value back again. 2493 * we get this value back again.
2522 */ 2494 */
2523 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2495 if (get_ob_key_link (op->arch, canonical_key))
2524 field->value = 0; 2496 field->value = 0;
2525 else 2497 else
2526 { 2498 {
2527 if (last) 2499 if (last)
2528 last->next = field->next; 2500 last->next = field->next;
2597 } 2569 }
2598 else 2570 else
2599 item = item->env; 2571 item = item->env;
2600} 2572}
2601 2573
2574const char *
2575object::flag_desc (char *desc, int len) const
2576{
2577 char *p = desc;
2578 bool first = true;
2579
2580 *p = 0;
2581
2582 for (int i = 0; i < NUM_FLAGS; i++)
2583 {
2584 if (len <= 10) // magic constant!
2585 {
2586 snprintf (p, len, ",...");
2587 break;
2588 }
2589
2590 if (flag [i])
2591 {
2592 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2593 len -= cnt;
2594 p += cnt;
2595 first = false;
2596 }
2597 }
2598
2599 return desc;
2600}
2601
2602// return a suitable string describing an objetc in enough detail to find it 2602// return a suitable string describing an object in enough detail to find it
2603const char * 2603const char *
2604object::debug_desc (char *info) const 2604object::debug_desc (char *info) const
2605{ 2605{
2606 char flagdesc[512];
2606 char info2[256 * 3]; 2607 char info2[256 * 4];
2607 char *p = info; 2608 char *p = info;
2608 2609
2609 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2610 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2610 count, 2611 count, uuid.seq,
2611 &name, 2612 &name,
2612 title ? " " : "", 2613 title ? "\",title:\"" : "",
2613 title ? (const char *)title : ""); 2614 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type);
2614 2616
2615 if (env) 2617 if (env)
2616 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2617 2619
2618 if (map) 2620 if (map)
2619 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2621 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2620 2622
2621 return info; 2623 return info;
2622} 2624}
2623 2625
2624const char * 2626const char *
2625object::debug_desc () const 2627object::debug_desc () const
2626{ 2628{
2627 static char info[256 * 3]; 2629 static char info[3][256 * 4];
2630 static int info_idx;
2631
2628 return debug_desc (info); 2632 return debug_desc (info [++info_idx % 3]);
2629} 2633}
2630 2634
2635struct region *
2636object::region () const
2637{
2638 return map ? map->region (x, y)
2639 : region::default_region ();
2640}
2641
2642const materialtype_t *
2643object::dominant_material () const
2644{
2645 if (materialtype_t *mat = name_to_material (materialname))
2646 return mat;
2647
2648 // omfg this is slow, this has to be temporary :)
2649 shstr unknown ("unknown");
2650
2651 return name_to_material (unknown);
2652}
2653
2654void
2655object::open_container (object *new_container)
2656{
2657 if (container == new_container)
2658 return;
2659
2660 if (object *old_container = container)
2661 {
2662 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2663 return;
2664
2665#if 0
2666 // remove the "Close old_container" object.
2667 if (object *closer = old_container->inv)
2668 if (closer->type == CLOSE_CON)
2669 closer->destroy ();
2670#endif
2671
2672 old_container->flag [FLAG_APPLIED] = 0;
2673 container = 0;
2674
2675 esrv_update_item (UPD_FLAGS, this, old_container);
2676 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2677 }
2678
2679 if (new_container)
2680 {
2681 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2682 return;
2683
2684 // TODO: this does not seem to serve any purpose anymore?
2685#if 0
2686 // insert the "Close Container" object.
2687 if (archetype *closer = new_container->other_arch)
2688 {
2689 object *closer = arch_to_object (new_container->other_arch);
2690 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2691 new_container->insert (closer);
2692 }
2693#endif
2694
2695 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2696
2697 new_container->flag [FLAG_APPLIED] = 1;
2698 container = new_container;
2699
2700 esrv_update_item (UPD_FLAGS, this, new_container);
2701 esrv_send_inventory (this, new_container);
2702 }
2703}
2704
2705

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines