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.86 by root, Tue Dec 26 08:17:58 2006 UTC vs.
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 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
… …
190 * Check nrof variable *before* calling can_merge() 191 * Check nrof variable *before* calling can_merge()
191 * 192 *
192 * Improvements made with merge: Better checking on potion, and also 193 * Improvements made with merge: Better checking on potion, and also
193 * check weight 194 * check weight
194 */ 195 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
197{ 197{
198 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
199 if (ob1 == ob2 199 if (ob1 == ob2
200 || ob1->type != ob2->type 200 || ob1->type != ob2->type
… …
277 277
278 /* Note sure why the following is the case - either the object has to 278 /* 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 279 * be animated or have a very low speed. Is this an attempted monster
280 * check? 280 * check?
281 */ 281 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 283 return 0;
284 284
285 switch (ob1->type) 285 switch (ob1->type)
286 { 286 {
287 case SCROLL: 287 case SCROLL:
… …
522 tail = new_link; 522 tail = new_link;
523 } 523 }
524 } 524 }
525 } 525 }
526 526
527 update_ob_speed (dst); 527 dst->set_speed (dst->speed);
528} 528}
529 529
530object * 530object *
531object::clone () 531object::clone ()
532{ 532{
… …
538/* 538/*
539 * If an object with the IS_TURNABLE() flag needs to be turned due 539 * 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 540 * 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. 541 * be called to update the face variable, _and_ how it looks on the map.
542 */ 542 */
543
544void 543void
545update_turn_face (object *op) 544update_turn_face (object *op)
546{ 545{
547 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 546 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548 return; 547 return;
548
549 SET_ANIMATION (op, op->direction); 549 SET_ANIMATION (op, op->direction);
550 update_object (op, UP_OBJ_FACE); 550 update_object (op, UP_OBJ_FACE);
551} 551}
552 552
553/* 553/*
554 * Updates the speed of an object. If the speed changes from 0 to another 554 * 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. 555 * 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. 556 * This function needs to be called whenever the speed of an object changes.
557 */ 557 */
558void 558void
559update_ob_speed (object *op) 559object::set_speed (float speed)
560{ 560{
561 extern int arch_init; 561 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 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
567 { 562 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 563 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 op->speed = 0; 564 speed = 0;
570 }
571
572 if (arch_init)
573 return;
574
575 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
576 { 565 }
577 /* If already on active list, don't do anything */
578 if (op->active_next || op->active_prev || op == active_objects)
579 return;
580 566
581 /* process_events() expects us to insert the object at the beginning 567 this->speed = speed;
582 * of the list. */
583 op->active_next = active_objects;
584 568
585 if (op->active_next != NULL) 569 if (has_active_speed ())
586 op->active_next->active_prev = op; 570 activate ();
587
588 active_objects = op;
589 }
590 else 571 else
591 { 572 deactivate ();
592 /* If not on the active list, nothing needs to be done */
593 if (!op->active_next && !op->active_prev && op != active_objects)
594 return;
595
596 if (op->active_prev == NULL)
597 {
598 active_objects = op->active_next;
599
600 if (op->active_next != NULL)
601 op->active_next->active_prev = NULL;
602 }
603 else
604 {
605 op->active_prev->active_next = op->active_next;
606
607 if (op->active_next)
608 op->active_next->active_prev = op->active_prev;
609 }
610
611 op->active_next = NULL;
612 op->active_prev = NULL;
613 }
614}
615
616/* This function removes object 'op' from the list of active
617 * objects.
618 * This should only be used for style maps or other such
619 * reference maps where you don't want an object that isn't
620 * in play chewing up cpu time getting processed.
621 * The reverse of this is to call update_ob_speed, which
622 * will do the right thing based on the speed of the object.
623 */
624void
625remove_from_active_list (object *op)
626{
627 /* If not on the active list, nothing needs to be done */
628 if (!op->active_next && !op->active_prev && op != active_objects)
629 return;
630
631 if (op->active_prev == NULL)
632 {
633 active_objects = op->active_next;
634 if (op->active_next != NULL)
635 op->active_next->active_prev = NULL;
636 }
637 else
638 {
639 op->active_prev->active_next = op->active_next;
640 if (op->active_next)
641 op->active_next->active_prev = op->active_prev;
642 }
643 op->active_next = NULL;
644 op->active_prev = NULL;
645} 573}
646 574
647/* 575/*
648 * update_object() updates the the map. 576 * update_object() updates the the map.
649 * It takes into account invisible objects (and represent squares covered 577 * It takes into account invisible objects (and represent squares covered
… …
697 return; 625 return;
698 } 626 }
699 627
700 mapspace &m = op->ms (); 628 mapspace &m = op->ms ();
701 629
702 if (m.flags_ & P_NEED_UPDATE) 630 if (!(m.flags_ & P_UPTODATE))
703 /* nop */; 631 /* nop */;
704 else if (action == UP_OBJ_INSERT) 632 else if (action == UP_OBJ_INSERT)
705 { 633 {
706 // this is likely overkill, TODO: revisit (schmorp) 634 // this is likely overkill, TODO: revisit (schmorp)
707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 635 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
… …
716 /* This isn't perfect, but I don't expect a lot of objects to 644 /* This isn't perfect, but I don't expect a lot of objects to
717 * to have move_allow right now. 645 * to have move_allow right now.
718 */ 646 */
719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 647 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
720 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 648 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
721 m.flags_ = P_NEED_UPDATE; 649 m.flags_ = 0;
722 } 650 }
723 /* if the object is being removed, we can't make intelligent 651 /* if the object is being removed, we can't make intelligent
724 * decisions, because remove_ob can't really pass the object 652 * decisions, because remove_ob can't really pass the object
725 * that is being removed. 653 * that is being removed.
726 */ 654 */
727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 655 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
728 m.flags_ = P_NEED_UPDATE; 656 m.flags_ = 0;
729 else if (action == UP_OBJ_FACE) 657 else if (action == UP_OBJ_FACE)
730 /* Nothing to do for that case */ ; 658 /* Nothing to do for that case */ ;
731 else 659 else
732 LOG (llevError, "update_object called with invalid action: %d\n", action); 660 LOG (llevError, "update_object called with invalid action: %d\n", action);
733 661
734 if (op->more) 662 if (op->more)
735 update_object (op->more, action); 663 update_object (op->more, action);
736} 664}
737 665
738object::vector object::objects; // not yet used
739object *object::first; 666object *object::first;
740 667
741object::object () 668object::object ()
742{ 669{
743 SET_FLAG (this, FLAG_REMOVED); 670 SET_FLAG (this, FLAG_REMOVED);
… …
776 703
777 prev = 0; 704 prev = 0;
778 next = 0; 705 next = 0;
779} 706}
780 707
781object *object::create () 708bool
709object::active () const
782{ 710{
783 object *op = new object; 711 return active_next || active_prev || this == active_objects;
784 op->link ();
785 return op;
786} 712}
787 713
788/*
789 * free_object() frees everything allocated by an object, removes
790 * it from the list of used objects, and puts it on the list of
791 * free objects. The IS_FREED() flag is set in the object.
792 * The object must have been removed by remove_ob() first for
793 * this function to succeed.
794 *
795 * If destroy_inventory is set, free inventory as well. Else drop items in
796 * inventory to the ground.
797 */
798void 714void
799object::do_destroy () 715object::activate ()
800{ 716{
801 attachable::do_destroy (); 717 /* If already on active list, don't do anything */
802 718 if (active ())
803 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this);
805
806 if (flag [FLAG_FRIENDLY])
807 remove_friendly_object (this);
808
809 if (!flag [FLAG_REMOVED])
810 remove ();
811
812 if (flag [FLAG_FREED])
813 return; 719 return;
814 720
815 flag [FLAG_FREED] = 1; 721 if (has_active_speed ())
816
817 // hack to ensure that freed objects still have a valid map
818 {
819 static maptile *freed_map; // freed objects are moved here to avoid crashes
820
821 if (!freed_map)
822 { 722 {
823 freed_map = new maptile; 723 /* process_events() expects us to insert the object at the beginning
724 * of the list. */
725 active_next = active_objects;
824 726
825 freed_map->name = "/internal/freed_objects_map"; 727 if (active_next)
826 freed_map->width = 3; 728 active_next->active_prev = this;
827 freed_map->height = 3;
828 729
829 freed_map->allocate (); 730 active_objects = this;
830 } 731 }
732}
831 733
832 map = freed_map; 734void
833 x = 1; 735object::activate_recursive ()
834 y = 1; 736{
737 activate ();
738
739 for (object *op = inv; op; op = op->below)
740 op->activate_recursive ();
741}
742
743/* This function removes object 'op' from the list of active
744 * objects.
745 * This should only be used for style maps or other such
746 * reference maps where you don't want an object that isn't
747 * in play chewing up cpu time getting processed.
748 * The reverse of this is to call update_ob_speed, which
749 * will do the right thing based on the speed of the object.
750 */
751void
752object::deactivate ()
753{
754 /* If not on the active list, nothing needs to be done */
755 if (!active ())
756 return;
757
758 if (active_prev == 0)
759 {
760 active_objects = active_next;
761 if (active_next)
762 active_next->active_prev = 0;
835 } 763 }
764 else
765 {
766 active_prev->active_next = active_next;
767 if (active_next)
768 active_next->active_prev = active_prev;
769 }
836 770
837 more = 0; 771 active_next = 0;
838 head = 0; 772 active_prev = 0;
839 inv = 0; 773}
840 774
841 // clear those pointers that likely might have circular references to us 775void
842 owner = 0; 776object::deactivate_recursive ()
843 enemy = 0; 777{
844 attacked_by = 0; 778 for (object *op = inv; op; op = op->below)
779 op->deactivate_recursive ();
845 780
846 // only relevant for players(?), but make sure of it anyways 781 deactivate ();
847 contr = 0; 782}
848 783
849 /* Remove object from the active list */ 784void
850 speed = 0; 785object::set_flag_inv (int flag, int value)
851 update_ob_speed (this); 786{
852 787 for (object *op = inv; op; op = op->below)
853 unlink (); 788 {
789 op->flag [flag] = value;
790 op->set_flag_inv (flag, value);
791 }
854} 792}
855 793
856/* 794/*
857 * Remove and free all objects in the inventory of the given object. 795 * Remove and free all objects in the inventory of the given object.
858 * object.c ? 796 * object.c ?
859 */ 797 */
860void 798void
861object::destroy_inv (bool drop_to_ground) 799object::destroy_inv (bool drop_to_ground)
862{ 800{
801 // need to check first, because the checks below might segfault
802 // as we might be on an invalid mapspace and crossfire code
803 // is too buggy to ensure that the inventory is empty.
804 // corollary: if you create arrows etc. with stuff in tis inventory,
805 // cf will crash below with off-map x and y
863 if (!inv) 806 if (!inv)
864 return; 807 return;
865 808
866 /* Only if the space blocks everything do we not process - 809 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects 810 * if some form of movement is allowed, let objects
868 * drop on that space. 811 * drop on that space.
869 */ 812 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 813 if (!drop_to_ground
814 || !map
815 || map->in_memory != MAP_IN_MEMORY
816 || ms ().move_block == MOVE_ALL)
871 { 817 {
872 while (inv) 818 while (inv)
873 { 819 {
874 inv->destroy_inv (drop_to_ground); 820 inv->destroy_inv (drop_to_ground);
875 inv->destroy (); 821 inv->destroy ();
… …
886 || op->type == RUNE 832 || op->type == RUNE
887 || op->type == TRAP 833 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE]) 834 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy (); 835 op->destroy ();
890 else 836 else
891 { 837 map->insert (op, x, y);
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 } 838 }
839 }
840}
841
842object *object::create ()
843{
844 object *op = new object;
845 op->link ();
846 return op;
847}
848
849void
850object::do_destroy ()
851{
852 if (flag [FLAG_IS_LINKED])
853 remove_button_link (this);
854
855 if (flag [FLAG_FRIENDLY])
856 remove_friendly_object (this);
857
858 if (!flag [FLAG_REMOVED])
859 remove ();
860
861 if (flag [FLAG_FREED])
862 return;
863
864 set_speed (0);
865
866 flag [FLAG_FREED] = 1;
867
868 attachable::do_destroy ();
869
870 destroy_inv (true);
871 unlink ();
872
873 // hack to ensure that freed objects still have a valid map
874 {
875 static maptile *freed_map; // freed objects are moved here to avoid crashes
876
877 if (!freed_map)
878 {
879 freed_map = new maptile;
880
881 freed_map->name = "/internal/freed_objects_map";
882 freed_map->width = 3;
883 freed_map->height = 3;
884
885 freed_map->alloc ();
886 freed_map->in_memory = MAP_IN_MEMORY;
897 } 887 }
888
889 map = freed_map;
890 x = 1;
891 y = 1;
892 }
893
894 head = 0;
895
896 if (more)
898 } 897 {
898 more->destroy ();
899 more = 0;
900 }
901
902 // clear those pointers that likely might have circular references to us
903 owner = 0;
904 enemy = 0;
905 attacked_by = 0;
906
907 // only relevant for players(?), but make sure of it anyways
908 contr = 0;
899} 909}
900 910
901void 911void
902object::destroy (bool destroy_inventory) 912object::destroy (bool destroy_inventory)
903{ 913{
904 if (destroyed ()) 914 if (destroyed ())
905 return; 915 return;
906 916
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory) 917 if (destroy_inventory)
915 destroy_inv (true); 918 destroy_inv (false);
916 919
917 attachable::destroy (); 920 attachable::destroy ();
918} 921}
919 922
920/* 923/*
… …
973 * to save cpu time. 976 * to save cpu time.
974 */ 977 */
975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 978 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
976 otmp->update_stats (); 979 otmp->update_stats ();
977 980
978 if (above != NULL) 981 if (above)
979 above->below = below; 982 above->below = below;
980 else 983 else
981 env->inv = below; 984 env->inv = below;
982 985
983 if (below != NULL) 986 if (below)
984 below->above = above; 987 below->above = above;
985 988
986 /* we set up values so that it could be inserted into 989 /* we set up values so that it could be inserted into
987 * the map, but we don't actually do that - it is up 990 * the map, but we don't actually do that - it is up
988 * to the caller to decide what we want to do. 991 * to the caller to decide what we want to do.
… …
992 above = 0, below = 0; 995 above = 0, below = 0;
993 env = 0; 996 env = 0;
994 } 997 }
995 else if (map) 998 else if (map)
996 { 999 {
997 /* Re did the following section of code - it looks like it had 1000 if (type == PLAYER)
998 * lots of logic for things we no longer care about
999 */ 1001 {
1002 --map->players;
1003 map->touch ();
1004 }
1005
1006 map->dirty = true;
1000 1007
1001 /* link the object above us */ 1008 /* link the object above us */
1002 if (above) 1009 if (above)
1003 above->below = below; 1010 above->below = below;
1004 else 1011 else
… …
1033 if (map->in_memory == MAP_SAVING) 1040 if (map->in_memory == MAP_SAVING)
1034 return; 1041 return;
1035 1042
1036 int check_walk_off = !flag [FLAG_NO_APPLY]; 1043 int check_walk_off = !flag [FLAG_NO_APPLY];
1037 1044
1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1045 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1039 { 1046 {
1040 /* No point updating the players look faces if he is the object 1047 /* No point updating the players look faces if he is the object
1041 * being removed. 1048 * being removed.
1042 */ 1049 */
1043 1050
… …
1055 1062
1056 if (tmp->contr->ns) 1063 if (tmp->contr->ns)
1057 tmp->contr->ns->floorbox_update (); 1064 tmp->contr->ns->floorbox_update ();
1058 } 1065 }
1059 1066
1060 /* See if player moving off should effect something */ 1067 /* See if object moving off should effect something */
1061 if (check_walk_off 1068 if (check_walk_off
1062 && ((move_type & tmp->move_off) 1069 && ((move_type & tmp->move_off)
1063 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1070 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1064 { 1071 {
1065 move_apply (tmp, this, 0); 1072 move_apply (tmp, this, 0);
… …
1067 if (destroyed ()) 1074 if (destroyed ())
1068 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1075 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1069 } 1076 }
1070 1077
1071 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1078 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1072 1079 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1073 if (tmp->above == tmp) 1080 if (tmp->above == tmp)
1074 tmp->above = 0; 1081 tmp->above = 0;
1075 1082
1076 last = tmp; 1083 last = tmp;
1077 } 1084 }
1078 1085
1079 /* last == NULL of there are no objects on this space */ 1086 /* last == NULL if there are no objects on this space */
1087 //TODO: this makes little sense, why only update the topmost object?
1080 if (!last) 1088 if (!last)
1081 map->at (x, y).flags_ = P_NEED_UPDATE; 1089 map->at (x, y).flags_ = 0;
1082 else 1090 else
1083 update_object (last, UP_OBJ_REMOVE); 1091 update_object (last, UP_OBJ_REMOVE);
1084 1092
1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1093 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1086 update_all_los (map, x, y); 1094 update_all_los (map, x, y);
… …
1129 * job preparing multi-part monsters 1137 * job preparing multi-part monsters
1130 */ 1138 */
1131object * 1139object *
1132insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1140insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1133{ 1141{
1134 object *tmp;
1135
1136 if (op->head)
1137 op = op->head;
1138
1139 for (tmp = op; tmp; tmp = tmp->more) 1142 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140 { 1143 {
1141 tmp->x = x + tmp->arch->clone.x; 1144 tmp->x = x + tmp->arch->clone.x;
1142 tmp->y = y + tmp->arch->clone.y; 1145 tmp->y = y + tmp->arch->clone.y;
1143 } 1146 }
1144 1147
… …
1175 { 1178 {
1176 LOG (llevError, "Trying to insert freed object!\n"); 1179 LOG (llevError, "Trying to insert freed object!\n");
1177 return NULL; 1180 return NULL;
1178 } 1181 }
1179 1182
1180 if (m == NULL) 1183 if (!m)
1181 { 1184 {
1182 char *dump = dump_object (op); 1185 char *dump = dump_object (op);
1183 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1186 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1184 free (dump); 1187 free (dump);
1185 return op; 1188 return op;
… …
1212 { 1215 {
1213 /* The part may be on a different map. */ 1216 /* The part may be on a different map. */
1214 1217
1215 object *more = op->more; 1218 object *more = op->more;
1216 1219
1217 /* We really need the caller to normalize coordinates - if 1220 /* We really need the caller to normalise coordinates - if
1218 * we set the map, that doesn't work if the location is within 1221 * we set the map, that doesn't work if the location is within
1219 * a map and this is straddling an edge. So only if coordinate 1222 * a map and this is straddling an edge. So only if coordinate
1220 * is clear wrong do we normalize it. 1223 * is clear wrong do we normalise it.
1221 */ 1224 */
1222 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1225 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1223 more->map = get_map_from_coord (m, &more->x, &more->y); 1226 more->map = get_map_from_coord (m, &more->x, &more->y);
1224 else if (!more->map) 1227 else if (!more->map)
1225 { 1228 {
… …
1249 y = op->y; 1252 y = op->y;
1250 1253
1251 /* this has to be done after we translate the coordinates. 1254 /* this has to be done after we translate the coordinates.
1252 */ 1255 */
1253 if (op->nrof && !(flag & INS_NO_MERGE)) 1256 if (op->nrof && !(flag & INS_NO_MERGE))
1254 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1257 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1255 if (object::can_merge (op, tmp)) 1258 if (object::can_merge (op, tmp))
1256 { 1259 {
1257 op->nrof += tmp->nrof; 1260 op->nrof += tmp->nrof;
1258 tmp->destroy (); 1261 tmp->destroy ();
1259 } 1262 }
… …
1286 else 1289 else
1287 { 1290 {
1288 /* If there are other objects, then */ 1291 /* If there are other objects, then */
1289 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1292 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1290 { 1293 {
1291 object *last = NULL; 1294 object *last = 0;
1292 1295
1293 /* 1296 /*
1294 * If there are multiple objects on this space, we do some trickier handling. 1297 * If there are multiple objects on this space, we do some trickier handling.
1295 * We've already dealt with merging if appropriate. 1298 * We've already dealt with merging if appropriate.
1296 * Generally, we want to put the new object on top. But if 1299 * Generally, we want to put the new object on top. But if
… …
1300 * once we get to them. This reduces the need to traverse over all of 1303 * once we get to them. This reduces the need to traverse over all of
1301 * them when adding another one - this saves quite a bit of cpu time 1304 * them when adding another one - this saves quite a bit of cpu time
1302 * when lots of spells are cast in one area. Currently, it is presumed 1305 * when lots of spells are cast in one area. Currently, it is presumed
1303 * that flying non pickable objects are spell objects. 1306 * that flying non pickable objects are spell objects.
1304 */ 1307 */
1305
1306 while (top != NULL) 1308 while (top)
1307 { 1309 {
1308 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1310 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1309 floor = top; 1311 floor = top;
1310 1312
1311 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1313 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1364 op->above = GET_MAP_OB (op->map, op->x, op->y); 1366 op->above = GET_MAP_OB (op->map, op->x, op->y);
1365 1367
1366 if (op->above) 1368 if (op->above)
1367 op->above->below = op; 1369 op->above->below = op;
1368 1370
1369 op->below = NULL; 1371 op->below = 0;
1370 op->ms ().bot = op; 1372 op->ms ().bot = op;
1371 } 1373 }
1372 else 1374 else
1373 { /* get inserted into the stack above top */ 1375 { /* get inserted into the stack above top */
1374 op->above = top->above; 1376 op->above = top->above;
… …
1378 1380
1379 op->below = top; 1381 op->below = top;
1380 top->above = op; 1382 top->above = op;
1381 } 1383 }
1382 1384
1383 if (op->above == NULL) 1385 if (!op->above)
1384 op->ms ().top = op; 1386 op->ms ().top = op;
1385 } /* else not INS_BELOW_ORIGINATOR */ 1387 } /* else not INS_BELOW_ORIGINATOR */
1386 1388
1387 if (op->type == PLAYER) 1389 if (op->type == PLAYER)
1390 {
1388 op->contr->do_los = 1; 1391 op->contr->do_los = 1;
1392 ++op->map->players;
1393 op->map->touch ();
1394 }
1395
1396 op->map->dirty = true;
1389 1397
1390 /* If we have a floor, we know the player, if any, will be above 1398 /* If we have a floor, we know the player, if any, will be above
1391 * it, so save a few ticks and start from there. 1399 * it, so save a few ticks and start from there.
1392 */ 1400 */
1393 if (!(flag & INS_MAP_LOAD)) 1401 if (!(flag & INS_MAP_LOAD))
… …
1399 * visible to others on this map. But update_all_los is really 1407 * visible to others on this map. But update_all_los is really
1400 * an inefficient way to do this, as it means los for all players 1408 * an inefficient way to do this, as it means los for all players
1401 * on the map will get recalculated. The players could very well 1409 * on the map will get recalculated. The players could very well
1402 * be far away from this change and not affected in any way - 1410 * be far away from this change and not affected in any way -
1403 * this should get redone to only look for players within range, 1411 * this should get redone to only look for players within range,
1404 * or just updating the P_NEED_UPDATE for spaces within this area 1412 * or just updating the P_UPTODATE for spaces within this area
1405 * of effect may be sufficient. 1413 * of effect may be sufficient.
1406 */ 1414 */
1407 if (op->map->darkness && (op->glow_radius != 0)) 1415 if (op->map->darkness && (op->glow_radius != 0))
1408 update_all_los (op->map, op->x, op->y); 1416 update_all_los (op->map, op->x, op->y);
1409 1417
… …
1447{ 1455{
1448 object *tmp, *tmp1; 1456 object *tmp, *tmp1;
1449 1457
1450 /* first search for itself and remove any old instances */ 1458 /* first search for itself and remove any old instances */
1451 1459
1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1460 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1461 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1454 tmp->destroy (); 1462 tmp->destroy ();
1455 1463
1456 tmp1 = arch_to_object (archetype::find (arch_string)); 1464 tmp1 = arch_to_object (archetype::find (arch_string));
1457 1465
1458 tmp1->x = op->x; 1466 tmp1->x = op->x;
1459 tmp1->y = op->y; 1467 tmp1->y = op->y;
1460 insert_ob_in_map (tmp1, op->map, op, 0); 1468 insert_ob_in_map (tmp1, op->map, op, 0);
1469}
1470
1471object *
1472object::insert_at (object *where, object *originator, int flags)
1473{
1474 where->map->insert (this, where->x, where->y, originator, flags);
1461} 1475}
1462 1476
1463/* 1477/*
1464 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1478 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1465 * is returned contains nr objects, and the remaining parts contains 1479 * is returned contains nr objects, and the remaining parts contains
1466 * the rest (or is removed and freed if that number is 0). 1480 * the rest (or is removed and freed if that number is 0).
1467 * On failure, NULL is returned, and the reason put into the 1481 * On failure, NULL is returned, and the reason put into the
1468 * global static errmsg array. 1482 * global static errmsg array.
1469 */ 1483 */
1470
1471object * 1484object *
1472get_split_ob (object *orig_ob, uint32 nr) 1485get_split_ob (object *orig_ob, uint32 nr)
1473{ 1486{
1474 object *newob; 1487 object *newob;
1475 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1488 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1739 * 1752 *
1740 * MSW 2001-07-08: Check all objects on space, not just those below 1753 * MSW 2001-07-08: Check all objects on space, not just those below
1741 * object being inserted. insert_ob_in_map may not put new objects 1754 * object being inserted. insert_ob_in_map may not put new objects
1742 * on top. 1755 * on top.
1743 */ 1756 */
1744
1745int 1757int
1746check_move_on (object *op, object *originator) 1758check_move_on (object *op, object *originator)
1747{ 1759{
1748 object *tmp; 1760 object *tmp;
1749 maptile *m = op->map; 1761 maptile *m = op->map;
… …
1776 1788
1777 /* The objects have to be checked from top to bottom. 1789 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1790 * Hence, we first go to the top:
1779 */ 1791 */
1780 1792
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1793 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1794 {
1783 /* Trim the search when we find the first other spell effect 1795 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1796 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1797 * we don't need to check all of them.
1786 */ 1798 */
… …
1844 * The first matching object is returned, or NULL if none. 1856 * The first matching object is returned, or NULL if none.
1845 */ 1857 */
1846object * 1858object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1859present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1860{
1849 if (m == NULL || out_of_map (m, x, y)) 1861 if (!m || out_of_map (m, x, y))
1850 { 1862 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1863 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1864 return NULL;
1853 } 1865 }
1854 1866
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1867 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1868 if (tmp->arch == at)
1857 return tmp; 1869 return tmp;
1858 1870
1859 return NULL; 1871 return NULL;
1860} 1872}
… …
1871 { 1883 {
1872 LOG (llevError, "Present called outside map.\n"); 1884 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1885 return NULL;
1874 } 1886 }
1875 1887
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1888 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1889 if (tmp->type == type)
1878 return tmp; 1890 return tmp;
1879 1891
1880 return NULL; 1892 return NULL;
1881} 1893}
… …
2606 } 2618 }
2607 else 2619 else
2608 item = item->env; 2620 item = item->env;
2609} 2621}
2610 2622
2623
2624const char *
2625object::flag_desc (char *desc, int len) const
2626{
2627 char *p = desc;
2628 bool first = true;
2629
2630 *p = 0;
2631
2632 for (int i = 0; i < NUM_FLAGS; i++)
2633 {
2634 if (len <= 10) // magic constant!
2635 {
2636 snprintf (p, len, ",...");
2637 break;
2638 }
2639
2640 if (flag [i])
2641 {
2642 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2643 len -= cnt;
2644 p += cnt;
2645 first = false;
2646 }
2647 }
2648
2649 return desc;
2650}
2651
2611// return a suitable string describing an objetc in enough detail to find it 2652// return a suitable string describing an object in enough detail to find it
2612const char * 2653const char *
2613object::debug_desc (char *info) const 2654object::debug_desc (char *info) const
2614{ 2655{
2656 char flagdesc[512];
2615 char info2[256 * 3]; 2657 char info2[256 * 4];
2616 char *p = info; 2658 char *p = info;
2617 2659
2618 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2660 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2619 count, 2661 count, uuid.seq,
2620 &name, 2662 &name,
2621 title ? " " : "", 2663 title ? "\",title:" : "",
2622 title ? (const char *)title : ""); 2664 title ? (const char *)title : "",
2665 flag_desc (flagdesc, 512), type);
2623 2666
2624 if (env) 2667 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2668 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2626 2669
2627 if (map) 2670 if (map)
2628 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2671 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2629 2672
2630 return info; 2673 return info;
2631} 2674}
2632 2675
2633const char * 2676const char *
2634object::debug_desc () const 2677object::debug_desc () const
2635{ 2678{
2636 static char info[256 * 3]; 2679 static char info[256 * 4];
2637 return debug_desc (info); 2680 return debug_desc (info);
2638} 2681}
2639 2682

Diff Legend

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