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.84 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
… …
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,
… …
141 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
143 */ 145 */
144 146
145 /* For each field in wants, */ 147 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 149 {
148 key_value *has_field; 150 key_value *has_field;
149 151
150 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
… …
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:
… …
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, 3); 370 save_object (freezer, op, 1);
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}
… …
490 489
491 if (is_removed) 490 if (is_removed)
492 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
493 492
494 if (speed < 0) 493 if (speed < 0)
495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
496 495
497 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
498 if (key_values) 497 if (key_values)
499 { 498 {
500 key_value *tail = 0; 499 key_value *tail = 0;
… …
522 tail = new_link; 521 tail = new_link;
523 } 522 }
524 } 523 }
525 } 524 }
526 525
527 update_ob_speed (dst); 526 dst->set_speed (dst->speed);
528} 527}
529 528
530object * 529object *
531object::clone () 530object::clone ()
532{ 531{
… …
538/* 537/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 538 * 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 539 * 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. 540 * be called to update the face variable, _and_ how it looks on the map.
542 */ 541 */
543
544void 542void
545update_turn_face (object *op) 543update_turn_face (object *op)
546{ 544{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 545 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 546 return;
547
549 SET_ANIMATION (op, op->direction); 548 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
551} 550}
552 551
553/* 552/*
554 * Updates the speed of an object. If the speed changes from 0 to another 553 * Updates the speed of an object. If the speed changes from 0 to another
555 * value, or vice versa, then add/remove the object from the active list. 554 * value, or vice versa, then add/remove the object from the active list.
556 * This function needs to be called whenever the speed of an object changes. 555 * This function needs to be called whenever the speed of an object changes.
557 */ 556 */
558void 557void
559update_ob_speed (object *op) 558object::set_speed (float speed)
560{ 559{
561 extern int arch_init; 560 if (flag [FLAG_FREED] && speed)
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566
567 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568 { 561 {
569 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
570#ifdef MANY_CORES
571 abort ();
572#else
573 op->speed = 0; 563 speed = 0;
574#endif
575 }
576
577 if (arch_init)
578 return;
579
580 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581 { 564 }
582 /* If already on active list, don't do anything */
583 if (op->active_next || op->active_prev || op == active_objects)
584 return;
585 565
586 /* process_events() expects us to insert the object at the beginning 566 this->speed = speed;
587 * of the list. */
588 op->active_next = active_objects;
589 567
590 if (op->active_next != NULL) 568 if (has_active_speed ())
591 op->active_next->active_prev = op; 569 activate ();
592
593 active_objects = op;
594 }
595 else 570 else
596 { 571 deactivate ();
597 /* If not on the active list, nothing needs to be done */
598 if (!op->active_next && !op->active_prev && op != active_objects)
599 return;
600
601 if (op->active_prev == NULL)
602 {
603 active_objects = op->active_next;
604
605 if (op->active_next != NULL)
606 op->active_next->active_prev = NULL;
607 }
608 else
609 {
610 op->active_prev->active_next = op->active_next;
611
612 if (op->active_next)
613 op->active_next->active_prev = op->active_prev;
614 }
615
616 op->active_next = NULL;
617 op->active_prev = NULL;
618 }
619}
620
621/* This function removes object 'op' from the list of active
622 * objects.
623 * This should only be used for style maps or other such
624 * reference maps where you don't want an object that isn't
625 * in play chewing up cpu time getting processed.
626 * The reverse of this is to call update_ob_speed, which
627 * will do the right thing based on the speed of the object.
628 */
629void
630remove_from_active_list (object *op)
631{
632 /* If not on the active list, nothing needs to be done */
633 if (!op->active_next && !op->active_prev && op != active_objects)
634 return;
635
636 if (op->active_prev == NULL)
637 {
638 active_objects = op->active_next;
639 if (op->active_next != NULL)
640 op->active_next->active_prev = NULL;
641 }
642 else
643 {
644 op->active_prev->active_next = op->active_next;
645 if (op->active_next)
646 op->active_next->active_prev = op->active_prev;
647 }
648 op->active_next = NULL;
649 op->active_prev = NULL;
650} 572}
651 573
652/* 574/*
653 * update_object() updates the the map. 575 * update_object() updates the the map.
654 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
… …
702 return; 624 return;
703 } 625 }
704 626
705 mapspace &m = op->ms (); 627 mapspace &m = op->ms ();
706 628
707 if (m.flags_ & P_NEED_UPDATE) 629 if (!(m.flags_ & P_UPTODATE))
708 /* nop */; 630 /* nop */;
709 else if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
710 { 632 {
711 // this is likely overkill, TODO: revisit (schmorp) 633 // this is likely overkill, TODO: revisit (schmorp)
712 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
… …
721 /* This isn't perfect, but I don't expect a lot of objects to 643 /* This isn't perfect, but I don't expect a lot of objects to
722 * to have move_allow right now. 644 * to have move_allow right now.
723 */ 645 */
724 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
725 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726 m.flags_ = P_NEED_UPDATE; 648 m.flags_ = 0;
727 } 649 }
728 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
729 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
730 * that is being removed. 652 * that is being removed.
731 */ 653 */
732 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733 m.flags_ = P_NEED_UPDATE; 655 m.flags_ = 0;
734 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
735 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
736 else 658 else
737 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
738 660
739 if (op->more) 661 if (op->more)
740 update_object (op->more, action); 662 update_object (op->more, action);
741} 663}
742 664
743object::vector object::objects; // not yet used
744object *object::first;
745
746object::object () 665object::object ()
747{ 666{
748 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
749 668
750 expmul = 1.0; 669 expmul = 1.0;
… …
754object::~object () 673object::~object ()
755{ 674{
756 free_key_values (this); 675 free_key_values (this);
757} 676}
758 677
678static int object_count;
679
759void object::link () 680void object::link ()
760{ 681{
761 count = ++ob_count; 682 assert (!index);//D
762 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
763 685
764 prev = 0; 686 refcnt_inc ();
765 next = object::first; 687 objects.insert (this);
766
767 if (object::first)
768 object::first->prev = this;
769
770 object::first = this;
771} 688}
772 689
773void object::unlink () 690void object::unlink ()
774{ 691{
775 if (this == object::first) 692 assert (index);//D
776 object::first = next; 693 objects.erase (this);
777 694 refcnt_dec ();
778 /* Remove this object from the list of used objects */
779 if (prev) prev->next = next;
780 if (next) next->prev = prev;
781
782 prev = 0;
783 next = 0;
784} 695}
785 696
786object *object::create ()
787{
788 object *op = new object;
789 op->link ();
790 return op;
791}
792
793/*
794 * free_object() frees everything allocated by an object, removes
795 * it from the list of used objects, and puts it on the list of
796 * free objects. The IS_FREED() flag is set in the object.
797 * The object must have been removed by remove_ob() first for
798 * this function to succeed.
799 *
800 * If destroy_inventory is set, free inventory as well. Else drop items in
801 * inventory to the ground.
802 */
803void 697void
804object::do_destroy () 698object::activate ()
805{ 699{
806 attachable::do_destroy (); 700 /* If already on active list, don't do anything */
807 701 if (active)
808 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this);
810
811 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this);
813
814 if (!flag [FLAG_REMOVED])
815 remove ();
816
817 if (flag [FLAG_FREED])
818 return; 702 return;
819 703
820 flag [FLAG_FREED] = 1; 704 if (has_active_speed ())
705 actives.insert (this);
706}
821 707
822 // hack to ensure that freed objects still have a valid map 708void
823 { 709object::activate_recursive ()
824 static maptile *freed_map; // freed objects are moved here to avoid crashes 710{
711 activate ();
825 712
826 if (!freed_map) 713 for (object *op = inv; op; op = op->below)
714 op->activate_recursive ();
715}
716
717/* This function removes object 'op' from the list of active
718 * objects.
719 * This should only be used for style maps or other such
720 * reference maps where you don't want an object that isn't
721 * in play chewing up cpu time getting processed.
722 * The reverse of this is to call update_ob_speed, which
723 * will do the right thing based on the speed of the object.
724 */
725void
726object::deactivate ()
727{
728 /* If not on the active list, nothing needs to be done */
729 if (!active)
730 return;
731
732 actives.erase (this);
733}
734
735void
736object::deactivate_recursive ()
737{
738 for (object *op = inv; op; op = op->below)
739 op->deactivate_recursive ();
740
741 deactivate ();
742}
743
744void
745object::set_flag_inv (int flag, int value)
746{
747 for (object *op = inv; op; op = op->below)
827 { 748 {
828 freed_map = new maptile; 749 op->flag [flag] = value;
829 750 op->set_flag_inv (flag, value);
830 freed_map->name = "/internal/freed_objects_map";
831 freed_map->width = 3;
832 freed_map->height = 3;
833
834 freed_map->allocate ();
835 } 751 }
836
837 map = freed_map;
838 x = 1;
839 y = 1;
840 }
841
842 more = 0;
843 head = 0;
844 inv = 0;
845
846 // clear those pointers that likely might have circular references to us
847 owner = 0;
848 enemy = 0;
849 attacked_by = 0;
850
851 // only relevant for players(?), but make sure of it anyways
852 contr = 0;
853
854 /* Remove object from the active list */
855 speed = 0;
856 update_ob_speed (this);
857
858 unlink ();
859} 752}
860 753
861/* 754/*
862 * Remove and free all objects in the inventory of the given object. 755 * Remove and free all objects in the inventory of the given object.
863 * object.c ? 756 * object.c ?
864 */ 757 */
865void 758void
866object::destroy_inv (bool drop_to_ground) 759object::destroy_inv (bool drop_to_ground)
867{ 760{
761 // need to check first, because the checks below might segfault
762 // as we might be on an invalid mapspace and crossfire code
763 // is too buggy to ensure that the inventory is empty.
764 // corollary: if you create arrows etc. with stuff in tis inventory,
765 // cf will crash below with off-map x and y
868 if (!inv) 766 if (!inv)
869 return; 767 return;
870 768
871 /* Only if the space blocks everything do we not process - 769 /* Only if the space blocks everything do we not process -
872 * if some form of movement is allowed, let objects 770 * if some form of movement is allowed, let objects
873 * drop on that space. 771 * drop on that space.
874 */ 772 */
875 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 773 if (!drop_to_ground
774 || !map
775 || map->in_memory != MAP_IN_MEMORY
776 || ms ().move_block == MOVE_ALL)
876 { 777 {
877 while (inv) 778 while (inv)
878 { 779 {
879 inv->destroy_inv (drop_to_ground); 780 inv->destroy_inv (drop_to_ground);
880 inv->destroy (); 781 inv->destroy ();
… …
888 789
889 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
890 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
891 || op->type == RUNE 792 || op->type == RUNE
892 || op->type == TRAP 793 || op->type == TRAP
893 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
894 op->destroy (); 796 op->destroy ();
895 else 797 else
896 { 798 map->insert (op, x, y);
897 op->remove ();
898 op->x = x;
899 op->y = y;
900 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901 }
902 } 799 }
903 } 800 }
801}
802
803object *object::create ()
804{
805 object *op = new object;
806 op->link ();
807 return op;
808}
809
810void
811object::do_destroy ()
812{
813 attachable::do_destroy ();
814
815 if (flag [FLAG_IS_LINKED])
816 remove_button_link (this);
817
818 if (flag [FLAG_FRIENDLY])
819 remove_friendly_object (this);
820
821 if (!flag [FLAG_REMOVED])
822 remove ();
823
824 destroy_inv (true);
825
826 deactivate ();
827 unlink ();
828
829 flag [FLAG_FREED] = 1;
830
831 // hack to ensure that freed objects still have a valid map
832 {
833 static maptile *freed_map; // freed objects are moved here to avoid crashes
834
835 if (!freed_map)
836 {
837 freed_map = new maptile;
838
839 freed_map->name = "/internal/freed_objects_map";
840 freed_map->width = 3;
841 freed_map->height = 3;
842
843 freed_map->alloc ();
844 freed_map->in_memory = MAP_IN_MEMORY;
845 }
846
847 map = freed_map;
848 x = 1;
849 y = 1;
850 }
851
852 head = 0;
853
854 if (more)
855 {
856 more->destroy ();
857 more = 0;
858 }
859
860 // clear those pointers that likely might have circular references to us
861 owner = 0;
862 enemy = 0;
863 attacked_by = 0;
904} 864}
905 865
906void 866void
907object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
908{ 868{
909 if (destroyed ()) 869 if (destroyed ())
910 return; 870 return;
911 871
912 if (more)
913 {
914 //TODO: non-head objects must not have inventory
915 more->destroy (destroy_inventory);
916 more = 0;
917 }
918
919 if (destroy_inventory) 872 if (destroy_inventory)
920 destroy_inv (true); 873 destroy_inv (false);
921 874
922 attachable::destroy (); 875 attachable::destroy ();
923} 876}
924 877
925/* 878/*
… …
946 * environment, the x and y coordinates will be updated to 899 * environment, the x and y coordinates will be updated to
947 * the previous environment. 900 * the previous environment.
948 * Beware: This function is called from the editor as well! 901 * Beware: This function is called from the editor as well!
949 */ 902 */
950void 903void
951object::remove () 904object::remove_slow ()
952{ 905{
953 object *tmp, *last = 0; 906 object *tmp, *last = 0;
954 object *otmp; 907 object *otmp;
955 908
956 if (QUERY_FLAG (this, FLAG_REMOVED)) 909 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
978 * to save cpu time. 931 * to save cpu time.
979 */ 932 */
980 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 933 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981 otmp->update_stats (); 934 otmp->update_stats ();
982 935
983 if (above != NULL) 936 if (above)
984 above->below = below; 937 above->below = below;
985 else 938 else
986 env->inv = below; 939 env->inv = below;
987 940
988 if (below != NULL) 941 if (below)
989 below->above = above; 942 below->above = above;
990 943
991 /* we set up values so that it could be inserted into 944 /* we set up values so that it could be inserted into
992 * the map, but we don't actually do that - it is up 945 * the map, but we don't actually do that - it is up
993 * to the caller to decide what we want to do. 946 * to the caller to decide what we want to do.
… …
997 above = 0, below = 0; 950 above = 0, below = 0;
998 env = 0; 951 env = 0;
999 } 952 }
1000 else if (map) 953 else if (map)
1001 { 954 {
1002 /* Re did the following section of code - it looks like it had 955 if (type == PLAYER)
1003 * lots of logic for things we no longer care about
1004 */ 956 {
957 --map->players;
958 map->touch ();
959 }
960
961 map->dirty = true;
962 mapspace &ms = this->ms ();
1005 963
1006 /* link the object above us */ 964 /* link the object above us */
1007 if (above) 965 if (above)
1008 above->below = below; 966 above->below = below;
1009 else 967 else
1010 map->at (x, y).top = below; /* we were top, set new top */ 968 ms.top = below; /* we were top, set new top */
1011 969
1012 /* Relink the object below us, if there is one */ 970 /* Relink the object below us, if there is one */
1013 if (below) 971 if (below)
1014 below->above = above; 972 below->above = above;
1015 else 973 else
… …
1017 /* Nothing below, which means we need to relink map object for this space 975 /* Nothing below, which means we need to relink map object for this space
1018 * use translated coordinates in case some oddness with map tiling is 976 * use translated coordinates in case some oddness with map tiling is
1019 * evident 977 * evident
1020 */ 978 */
1021 if (GET_MAP_OB (map, x, y) != this) 979 if (GET_MAP_OB (map, x, y) != this)
1022 {
1023 char *dump = dump_object (this);
1024 LOG (llevError,
1025 "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); 980 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 ());
1026 free (dump);
1027 dump = dump_object (GET_MAP_OB (map, x, y));
1028 LOG (llevError, "%s\n", dump);
1029 free (dump);
1030 }
1031 981
1032 map->at (x, y).bot = above; /* goes on above it. */ 982 ms.bot = above; /* goes on above it. */
1033 } 983 }
1034 984
1035 above = 0; 985 above = 0;
1036 below = 0; 986 below = 0;
1037 987
1038 if (map->in_memory == MAP_SAVING) 988 if (map->in_memory == MAP_SAVING)
1039 return; 989 return;
1040 990
1041 int check_walk_off = !flag [FLAG_NO_APPLY]; 991 int check_walk_off = !flag [FLAG_NO_APPLY];
1042 992
1043 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 993 for (tmp = ms.bot; tmp; tmp = tmp->above)
1044 { 994 {
1045 /* No point updating the players look faces if he is the object 995 /* No point updating the players look faces if he is the object
1046 * being removed. 996 * being removed.
1047 */ 997 */
1048 998
… …
1060 1010
1061 if (tmp->contr->ns) 1011 if (tmp->contr->ns)
1062 tmp->contr->ns->floorbox_update (); 1012 tmp->contr->ns->floorbox_update ();
1063 } 1013 }
1064 1014
1065 /* See if player moving off should effect something */ 1015 /* See if object moving off should effect something */
1066 if (check_walk_off 1016 if (check_walk_off
1067 && ((move_type & tmp->move_off) 1017 && ((move_type & tmp->move_off)
1068 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1018 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069 { 1019 {
1070 move_apply (tmp, this, 0); 1020 move_apply (tmp, this, 0);
… …
1072 if (destroyed ()) 1022 if (destroyed ())
1073 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1023 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074 } 1024 }
1075 1025
1076 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1026 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077 1027 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078 if (tmp->above == tmp) 1028 if (tmp->above == tmp)
1079 tmp->above = 0; 1029 tmp->above = 0;
1080 1030
1081 last = tmp; 1031 last = tmp;
1082 } 1032 }
1083 1033
1084 /* last == NULL of there are no objects on this space */ 1034 /* last == NULL if there are no objects on this space */
1035 //TODO: this makes little sense, why only update the topmost object?
1085 if (!last) 1036 if (!last)
1086 map->at (x, y).flags_ = P_NEED_UPDATE; 1037 map->at (x, y).flags_ = 0;
1087 else 1038 else
1088 update_object (last, UP_OBJ_REMOVE); 1039 update_object (last, UP_OBJ_REMOVE);
1089 1040
1090 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1041 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091 update_all_los (map, x, y); 1042 update_all_los (map, x, y);
… …
1128 1079
1129 return 0; 1080 return 0;
1130} 1081}
1131 1082
1132/* 1083/*
1133 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1084 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1134 * job preparing multi-part monsters 1085 * job preparing multi-part monsters.
1135 */ 1086 */
1136object * 1087object *
1137insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1088insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138{ 1089{
1139 object *tmp;
1140
1141 if (op->head)
1142 op = op->head;
1143
1144 for (tmp = op; tmp; tmp = tmp->more) 1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145 { 1091 {
1146 tmp->x = x + tmp->arch->clone.x; 1092 tmp->x = x + tmp->arch->clone.x;
1147 tmp->y = y + tmp->arch->clone.y; 1093 tmp->y = y + tmp->arch->clone.y;
1148 } 1094 }
1149 1095
… …
1172 */ 1118 */
1173object * 1119object *
1174insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175{ 1121{
1176 object *tmp, *top, *floor = NULL; 1122 object *tmp, *top, *floor = NULL;
1177 sint16 x, y;
1178 1123
1179 if (QUERY_FLAG (op, FLAG_FREED)) 1124 if (QUERY_FLAG (op, FLAG_FREED))
1180 { 1125 {
1181 LOG (llevError, "Trying to insert freed object!\n"); 1126 LOG (llevError, "Trying to insert freed object!\n");
1182 return NULL; 1127 return NULL;
1183 } 1128 }
1184 1129
1185 if (m == NULL) 1130 if (!QUERY_FLAG (op, FLAG_REMOVED))
1131 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1132
1133 op->remove ();
1134
1135 if (!m)
1186 { 1136 {
1187 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1188 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1189 free (dump); 1139 free (dump);
1190 return op; 1140 return op;
… …
1203#endif 1153#endif
1204 free (dump); 1154 free (dump);
1205 return op; 1155 return op;
1206 } 1156 }
1207 1157
1208 if (!QUERY_FLAG (op, FLAG_REMOVED))
1209 {
1210 char *dump = dump_object (op);
1211 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1212 free (dump);
1213 return op;
1214 }
1215
1216 if (op->more)
1217 {
1218 /* The part may be on a different map. */
1219
1220 object *more = op->more; 1158 if (object *more = op->more)
1221 1159 {
1222 /* We really need the caller to normalize coordinates - if
1223 * we set the map, that doesn't work if the location is within
1224 * a map and this is straddling an edge. So only if coordinate
1225 * is clear wrong do we normalize it.
1226 */
1227 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228 more->map = get_map_from_coord (m, &more->x, &more->y);
1229 else if (!more->map)
1230 {
1231 /* For backwards compatibility - when not dealing with tiled maps,
1232 * more->map should always point to the parent.
1233 */
1234 more->map = m;
1235 }
1236
1237 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1160 if (!insert_ob_in_map (more, m, originator, flag))
1238 { 1161 {
1239 if (!op->head) 1162 if (!op->head)
1240 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1163 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241 1164
1242 return 0; 1165 return 0;
… …
1247 1170
1248 /* Ideally, the caller figures this out. However, it complicates a lot 1171 /* Ideally, the caller figures this out. However, it complicates a lot
1249 * of areas of callers (eg, anything that uses find_free_spot would now 1172 * of areas of callers (eg, anything that uses find_free_spot would now
1250 * need extra work 1173 * need extra work
1251 */ 1174 */
1252 op->map = get_map_from_coord (m, &op->x, &op->y); 1175 if (!xy_normalise (m, op->x, op->y))
1253 x = op->x; 1176 return 0;
1254 y = op->y; 1177
1178 op->map = m;
1179 mapspace &ms = op->ms ();
1255 1180
1256 /* this has to be done after we translate the coordinates. 1181 /* this has to be done after we translate the coordinates.
1257 */ 1182 */
1258 if (op->nrof && !(flag & INS_NO_MERGE)) 1183 if (op->nrof && !(flag & INS_NO_MERGE))
1259 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1184 for (tmp = ms.bot; tmp; tmp = tmp->above)
1260 if (object::can_merge (op, tmp)) 1185 if (object::can_merge (op, tmp))
1261 { 1186 {
1262 op->nrof += tmp->nrof; 1187 op->nrof += tmp->nrof;
1263 tmp->destroy (); 1188 tmp->destroy ();
1264 } 1189 }
… …
1281 op->below = originator->below; 1206 op->below = originator->below;
1282 1207
1283 if (op->below) 1208 if (op->below)
1284 op->below->above = op; 1209 op->below->above = op;
1285 else 1210 else
1286 op->ms ().bot = op; 1211 ms.bot = op;
1287 1212
1288 /* since *below* originator, no need to update top */ 1213 /* since *below* originator, no need to update top */
1289 originator->below = op; 1214 originator->below = op;
1290 } 1215 }
1291 else 1216 else
1292 { 1217 {
1218 top = ms.bot;
1219
1293 /* If there are other objects, then */ 1220 /* If there are other objects, then */
1294 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1221 if ((!(flag & INS_MAP_LOAD)) && top)
1295 { 1222 {
1296 object *last = NULL; 1223 object *last = 0;
1297 1224
1298 /* 1225 /*
1299 * If there are multiple objects on this space, we do some trickier handling. 1226 * If there are multiple objects on this space, we do some trickier handling.
1300 * We've already dealt with merging if appropriate. 1227 * We've already dealt with merging if appropriate.
1301 * Generally, we want to put the new object on top. But if 1228 * Generally, we want to put the new object on top. But if
… …
1305 * once we get to them. This reduces the need to traverse over all of 1232 * once we get to them. This reduces the need to traverse over all of
1306 * them when adding another one - this saves quite a bit of cpu time 1233 * them when adding another one - this saves quite a bit of cpu time
1307 * when lots of spells are cast in one area. Currently, it is presumed 1234 * when lots of spells are cast in one area. Currently, it is presumed
1308 * that flying non pickable objects are spell objects. 1235 * that flying non pickable objects are spell objects.
1309 */ 1236 */
1310 1237 for (top = ms.bot; top; top = top->above)
1311 while (top != NULL)
1312 { 1238 {
1313 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1239 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314 floor = top; 1240 floor = top;
1315 1241
1316 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1242 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1319 top = top->below; 1245 top = top->below;
1320 break; 1246 break;
1321 } 1247 }
1322 1248
1323 last = top; 1249 last = top;
1324 top = top->above;
1325 } 1250 }
1326 1251
1327 /* Don't want top to be NULL, so set it to the last valid object */ 1252 /* Don't want top to be NULL, so set it to the last valid object */
1328 top = last; 1253 top = last;
1329 1254
… …
1336 * Unless those objects are exits, type 66 1261 * Unless those objects are exits, type 66
1337 * If INS_ON_TOP is used, don't do this processing 1262 * If INS_ON_TOP is used, don't do this processing
1338 * Need to find the object that in fact blocks view, otherwise 1263 * Need to find the object that in fact blocks view, otherwise
1339 * stacking is a bit odd. 1264 * stacking is a bit odd.
1340 */ 1265 */
1341 if (!(flag & INS_ON_TOP) && 1266 if (!(flag & INS_ON_TOP)
1342 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1267 && ms.flags () & P_BLOCKSVIEW
1268 && (op->face && !op->face->visibility))
1343 { 1269 {
1344 for (last = top; last != floor; last = last->below) 1270 for (last = top; last != floor; last = last->below)
1345 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346 break; 1272 break;
1273
1347 /* Check to see if we found the object that blocks view, 1274 /* Check to see if we found the object that blocks view,
1348 * and make sure we have a below pointer for it so that 1275 * and make sure we have a below pointer for it so that
1349 * we can get inserted below this one, which requires we 1276 * we can get inserted below this one, which requires we
1350 * set top to the object below us. 1277 * set top to the object below us.
1351 */ 1278 */
… …
1353 top = last->below; 1280 top = last->below;
1354 } 1281 }
1355 } /* If objects on this space */ 1282 } /* If objects on this space */
1356 1283
1357 if (flag & INS_MAP_LOAD) 1284 if (flag & INS_MAP_LOAD)
1358 top = GET_MAP_TOP (op->map, op->x, op->y); 1285 top = ms.top;
1359 1286
1360 if (flag & INS_ABOVE_FLOOR_ONLY) 1287 if (flag & INS_ABOVE_FLOOR_ONLY)
1361 top = floor; 1288 top = floor;
1362 1289
1363 /* Top is the object that our object (op) is going to get inserted above. 1290 /* Top is the object that our object (op) is going to get inserted above.
1364 */ 1291 */
1365 1292
1366 /* First object on this space */ 1293 /* First object on this space */
1367 if (!top) 1294 if (!top)
1368 { 1295 {
1369 op->above = GET_MAP_OB (op->map, op->x, op->y); 1296 op->above = ms.bot;
1370 1297
1371 if (op->above) 1298 if (op->above)
1372 op->above->below = op; 1299 op->above->below = op;
1373 1300
1374 op->below = NULL; 1301 op->below = 0;
1375 op->ms ().bot = op; 1302 ms.bot = op;
1376 } 1303 }
1377 else 1304 else
1378 { /* get inserted into the stack above top */ 1305 { /* get inserted into the stack above top */
1379 op->above = top->above; 1306 op->above = top->above;
1380 1307
… …
1383 1310
1384 op->below = top; 1311 op->below = top;
1385 top->above = op; 1312 top->above = op;
1386 } 1313 }
1387 1314
1388 if (op->above == NULL) 1315 if (!op->above)
1389 op->ms ().top = op; 1316 ms.top = op;
1390 } /* else not INS_BELOW_ORIGINATOR */ 1317 } /* else not INS_BELOW_ORIGINATOR */
1391 1318
1392 if (op->type == PLAYER) 1319 if (op->type == PLAYER)
1320 {
1393 op->contr->do_los = 1; 1321 op->contr->do_los = 1;
1322 ++op->map->players;
1323 op->map->touch ();
1324 }
1325
1326 op->map->dirty = true;
1394 1327
1395 /* If we have a floor, we know the player, if any, will be above 1328 /* If we have a floor, we know the player, if any, will be above
1396 * it, so save a few ticks and start from there. 1329 * it, so save a few ticks and start from there.
1397 */ 1330 */
1398 if (!(flag & INS_MAP_LOAD)) 1331 if (!(flag & INS_MAP_LOAD))
1399 if (object *pl = op->ms ().player ()) 1332 if (object *pl = ms.player ())
1400 if (pl->contr->ns) 1333 if (pl->contr->ns)
1401 pl->contr->ns->floorbox_update (); 1334 pl->contr->ns->floorbox_update ();
1402 1335
1403 /* If this object glows, it may affect lighting conditions that are 1336 /* If this object glows, it may affect lighting conditions that are
1404 * visible to others on this map. But update_all_los is really 1337 * visible to others on this map. But update_all_los is really
1405 * an inefficient way to do this, as it means los for all players 1338 * an inefficient way to do this, as it means los for all players
1406 * on the map will get recalculated. The players could very well 1339 * on the map will get recalculated. The players could very well
1407 * be far away from this change and not affected in any way - 1340 * be far away from this change and not affected in any way -
1408 * this should get redone to only look for players within range, 1341 * this should get redone to only look for players within range,
1409 * or just updating the P_NEED_UPDATE for spaces within this area 1342 * or just updating the P_UPTODATE for spaces within this area
1410 * of effect may be sufficient. 1343 * of effect may be sufficient.
1411 */ 1344 */
1412 if (op->map->darkness && (op->glow_radius != 0)) 1345 if (op->map->darkness && (op->glow_radius != 0))
1413 update_all_los (op->map, op->x, op->y); 1346 update_all_los (op->map, op->x, op->y);
1414 1347
… …
1452{ 1385{
1453 object *tmp, *tmp1; 1386 object *tmp, *tmp1;
1454 1387
1455 /* first search for itself and remove any old instances */ 1388 /* first search for itself and remove any old instances */
1456 1389
1457 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1390 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1391 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459 tmp->destroy (); 1392 tmp->destroy ();
1460 1393
1461 tmp1 = arch_to_object (archetype::find (arch_string)); 1394 tmp1 = arch_to_object (archetype::find (arch_string));
1462 1395
1463 tmp1->x = op->x; 1396 tmp1->x = op->x;
1464 tmp1->y = op->y; 1397 tmp1->y = op->y;
1465 insert_ob_in_map (tmp1, op->map, op, 0); 1398 insert_ob_in_map (tmp1, op->map, op, 0);
1399}
1400
1401object *
1402object::insert_at (object *where, object *originator, int flags)
1403{
1404 where->map->insert (this, where->x, where->y, originator, flags);
1466} 1405}
1467 1406
1468/* 1407/*
1469 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1408 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1470 * is returned contains nr objects, and the remaining parts contains 1409 * is returned contains nr objects, and the remaining parts contains
1471 * the rest (or is removed and freed if that number is 0). 1410 * the rest (or is removed and freed if that number is 0).
1472 * On failure, NULL is returned, and the reason put into the 1411 * On failure, NULL is returned, and the reason put into the
1473 * global static errmsg array. 1412 * global static errmsg array.
1474 */ 1413 */
1475
1476object * 1414object *
1477get_split_ob (object *orig_ob, uint32 nr) 1415get_split_ob (object *orig_ob, uint32 nr)
1478{ 1416{
1479 object *newob; 1417 object *newob;
1480 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1418 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1744 * 1682 *
1745 * MSW 2001-07-08: Check all objects on space, not just those below 1683 * MSW 2001-07-08: Check all objects on space, not just those below
1746 * object being inserted. insert_ob_in_map may not put new objects 1684 * object being inserted. insert_ob_in_map may not put new objects
1747 * on top. 1685 * on top.
1748 */ 1686 */
1749
1750int 1687int
1751check_move_on (object *op, object *originator) 1688check_move_on (object *op, object *originator)
1752{ 1689{
1753 object *tmp; 1690 object *tmp;
1754 maptile *m = op->map; 1691 maptile *m = op->map;
… …
1781 1718
1782 /* The objects have to be checked from top to bottom. 1719 /* The objects have to be checked from top to bottom.
1783 * Hence, we first go to the top: 1720 * Hence, we first go to the top:
1784 */ 1721 */
1785 1722
1786 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1723 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787 { 1724 {
1788 /* Trim the search when we find the first other spell effect 1725 /* Trim the search when we find the first other spell effect
1789 * this helps performance so that if a space has 50 spell objects, 1726 * this helps performance so that if a space has 50 spell objects,
1790 * we don't need to check all of them. 1727 * we don't need to check all of them.
1791 */ 1728 */
… …
1849 * The first matching object is returned, or NULL if none. 1786 * The first matching object is returned, or NULL if none.
1850 */ 1787 */
1851object * 1788object *
1852present_arch (const archetype *at, maptile *m, int x, int y) 1789present_arch (const archetype *at, maptile *m, int x, int y)
1853{ 1790{
1854 if (m == NULL || out_of_map (m, x, y)) 1791 if (!m || out_of_map (m, x, y))
1855 { 1792 {
1856 LOG (llevError, "Present_arch called outside map.\n"); 1793 LOG (llevError, "Present_arch called outside map.\n");
1857 return NULL; 1794 return NULL;
1858 } 1795 }
1859 1796
1860 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1797 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1861 if (tmp->arch == at) 1798 if (tmp->arch == at)
1862 return tmp; 1799 return tmp;
1863 1800
1864 return NULL; 1801 return NULL;
1865} 1802}
… …
1876 { 1813 {
1877 LOG (llevError, "Present called outside map.\n"); 1814 LOG (llevError, "Present called outside map.\n");
1878 return NULL; 1815 return NULL;
1879 } 1816 }
1880 1817
1881 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1818 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1882 if (tmp->type == type) 1819 if (tmp->type == type)
1883 return tmp; 1820 return tmp;
1884 1821
1885 return NULL; 1822 return NULL;
1886} 1823}
… …
2201 2138
2202 return 3; 2139 return 3;
2203} 2140}
2204 2141
2205/* 2142/*
2206 * absdir(int): Returns a number between 1 and 8, which represent
2207 * the "absolute" direction of a number (it actually takes care of
2208 * "overflow" in previous calculations of a direction).
2209 */
2210
2211int
2212absdir (int d)
2213{
2214 while (d < 1)
2215 d += 8;
2216
2217 while (d > 8)
2218 d -= 8;
2219
2220 return d;
2221}
2222
2223/*
2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2143 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2225 * between two directions (which are expected to be absolute (see absdir()) 2144 * between two directions (which are expected to be absolute (see absdir())
2226 */ 2145 */
2227
2228int 2146int
2229dirdiff (int dir1, int dir2) 2147dirdiff (int dir1, int dir2)
2230{ 2148{
2231 int d; 2149 int d;
2232 2150
… …
2611 } 2529 }
2612 else 2530 else
2613 item = item->env; 2531 item = item->env;
2614} 2532}
2615 2533
2534
2535const char *
2536object::flag_desc (char *desc, int len) const
2537{
2538 char *p = desc;
2539 bool first = true;
2540
2541 *p = 0;
2542
2543 for (int i = 0; i < NUM_FLAGS; i++)
2544 {
2545 if (len <= 10) // magic constant!
2546 {
2547 snprintf (p, len, ",...");
2548 break;
2549 }
2550
2551 if (flag [i])
2552 {
2553 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2554 len -= cnt;
2555 p += cnt;
2556 first = false;
2557 }
2558 }
2559
2560 return desc;
2561}
2562
2616// return a suitable string describing an objetc in enough detail to find it 2563// return a suitable string describing an object in enough detail to find it
2617const char * 2564const char *
2618object::debug_desc (char *info) const 2565object::debug_desc (char *info) const
2619{ 2566{
2567 char flagdesc[512];
2620 char info2[256 * 3]; 2568 char info2[256 * 4];
2621 char *p = info; 2569 char *p = info;
2622 2570
2623 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2571 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2624 count, 2572 count, uuid.seq,
2625 &name, 2573 &name,
2626 title ? " " : "", 2574 title ? "\",title:\"" : "",
2627 title ? (const char *)title : ""); 2575 title ? (const char *)title : "",
2576 flag_desc (flagdesc, 512), type);
2628 2577
2629 if (env) 2578 if (env)
2630 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2631 2580
2632 if (map) 2581 if (map)
2633 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2582 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2634 2583
2635 return info; 2584 return info;
2636} 2585}
2637 2586
2638const char * 2587const char *
2639object::debug_desc () const 2588object::debug_desc () const
2640{ 2589{
2641 static char info[256 * 3]; 2590 static char info[256 * 4];
2642 return debug_desc (info); 2591 return debug_desc (info);
2643} 2592}
2644 2593
2594const char *
2595object::debug_desc2 () const
2596{
2597 static char info[256 * 4];
2598 return debug_desc (info);
2599}
2600

Diff Legend

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