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.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.101 by root, Mon Jan 1 17:30:33 2007 UTC

… …
190 * Check nrof variable *before* calling can_merge() 190 * Check nrof variable *before* calling can_merge()
191 * 191 *
192 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
193 * check weight 193 * check weight
194 */ 194 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 195bool object::can_merge_slow (object *ob1, object *ob2)
197{ 196{
198 /* A couple quicksanity checks */ 197 /* A couple quicksanity checks */
199 if (ob1 == ob2 198 if (ob1 == ob2
200 || ob1->type != ob2->type 199 || ob1->type != ob2->type
… …
277 276
278 /* Note sure why the following is the case - either the object has to 277 /* 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 278 * be animated or have a very low speed. Is this an attempted monster
280 * check? 279 * check?
281 */ 280 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 281 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 282 return 0;
284 283
285 switch (ob1->type) 284 switch (ob1->type)
286 { 285 {
287 case SCROLL: 286 case SCROLL:
… …
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/*
… …
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
559object::set_speed (float speed) 558object::set_speed (float speed)
560{ 559{
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) 560 if (flag [FLAG_FREED] && speed)
567 { 561 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name); 562 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0; 563 speed = 0;
570 } 564 }
571 565
572 this->speed = speed; 566 this->speed = speed;
573 567
574 if (arch_init) 568 if (has_active_speed ())
575 return; 569 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 570 else
593 { 571 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} 572}
648 573
649/* 574/*
650 * update_object() updates the the map. 575 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 576 * It takes into account invisible objects (and represent squares covered
… …
699 return; 624 return;
700 } 625 }
701 626
702 mapspace &m = op->ms (); 627 mapspace &m = op->ms ();
703 628
704 if (m.flags_ & P_NEED_UPDATE) 629 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 630 /* nop */;
706 else if (action == UP_OBJ_INSERT) 631 else if (action == UP_OBJ_INSERT)
707 { 632 {
708 // this is likely overkill, TODO: revisit (schmorp) 633 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 634 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 643 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 644 * to have move_allow right now.
720 */ 645 */
721 || ((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
722 || 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)
723 m.flags_ = P_NEED_UPDATE; 648 m.flags_ = 0;
724 } 649 }
725 /* if the object is being removed, we can't make intelligent 650 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 651 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 652 * that is being removed.
728 */ 653 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 655 m.flags_ = 0;
731 else if (action == UP_OBJ_FACE) 656 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 657 /* Nothing to do for that case */ ;
733 else 658 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 659 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 660
736 if (op->more) 661 if (op->more)
737 update_object (op->more, action); 662 update_object (op->more, action);
738} 663}
739 664
740object::vector object::objects; // not yet used
741object *object::first; 665object *object::first;
742 666
743object::object () 667object::object ()
744{ 668{
745 SET_FLAG (this, FLAG_REMOVED); 669 SET_FLAG (this, FLAG_REMOVED);
… …
778 702
779 prev = 0; 703 prev = 0;
780 next = 0; 704 next = 0;
781} 705}
782 706
783object *object::create () 707bool
708object::active () const
784{ 709{
785 object *op = new object; 710 return active_next || active_prev || this == active_objects;
786 op->link ();
787 return op;
788} 711}
789 712
790void 713void
791object::do_destroy () 714object::activate ()
792{ 715{
793 attachable::do_destroy (); 716 /* If already on active list, don't do anything */
794 717 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; 718 return;
806 719
807 flag [FLAG_FREED] = 1; 720 if (has_active_speed ())
808
809 while (inv)
810 inv->destroy ();
811
812 set_speed (0);
813 unlink ();
814
815 // hack to ensure that freed objects still have a valid map
816 {
817 static maptile *freed_map; // freed objects are moved here to avoid crashes
818
819 if (!freed_map)
820 { 721 {
821 freed_map = new maptile; 722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
822 725
823 freed_map->name = "/internal/freed_objects_map"; 726 if (active_next)
824 freed_map->width = 3; 727 active_next->active_prev = this;
825 freed_map->height = 3;
826 728
827 freed_map->allocate (); 729 active_objects = this;
828 } 730 }
731}
829 732
830 map = freed_map; 733void
831 x = 1; 734object::activate_recursive ()
832 y = 1; 735{
833 } 736 activate ();
834 737
835 head = 0; 738 for (object *op = inv; op; op = op->above)
739 op->activate_recursive ();
740}
836 741
837 if (more) 742/* This function removes object 'op' from the list of active
838 { 743 * objects.
839 more->destroy (); 744 * This should only be used for style maps or other such
840 more = 0; 745 * reference maps where you don't want an object that isn't
746 * in play chewing up cpu time getting processed.
747 * The reverse of this is to call update_ob_speed, which
748 * will do the right thing based on the speed of the object.
749 */
750void
751object::deactivate ()
752{
753 /* If not on the active list, nothing needs to be done */
754 if (!active ())
755 return;
756
757 if (active_prev == 0)
841 } 758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
842 769
843 // clear those pointers that likely might have circular references to us 770 active_next = 0;
844 owner = 0; 771 active_prev = 0;
845 enemy = 0; 772}
846 attacked_by = 0;
847 773
848 // only relevant for players(?), but make sure of it anyways 774void
849 contr = 0; 775object::deactivate_recursive ()
776{
777 for (object *op = inv; op; op = op->above)
778 op->deactivate_recursive ();
779
780 deactivate ();
850} 781}
851 782
852/* 783/*
853 * Remove and free all objects in the inventory of the given object. 784 * Remove and free all objects in the inventory of the given object.
854 * object.c ? 785 * object.c ?
855 */ 786 */
856void 787void
857object::destroy_inv (bool drop_to_ground) 788object::destroy_inv (bool drop_to_ground)
858{ 789{
790 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory,
794 // cf will crash below with off-map x and y
795 if (!inv)
796 return;
797
859 /* Only if the space blocks everything do we not process - 798 /* Only if the space blocks everything do we not process -
860 * if some form of movement is allowed, let objects 799 * if some form of movement is allowed, let objects
861 * drop on that space. 800 * drop on that space.
862 */ 801 */
863 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 802 if (!drop_to_ground
803 || !map
804 || map->in_memory != MAP_IN_MEMORY
805 || ms ().move_block == MOVE_ALL)
864 { 806 {
865 while (inv) 807 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
866 inv->destroy (); 810 inv->destroy ();
811 }
867 } 812 }
868 else 813 else
869 { /* Put objects in inventory onto this space */ 814 { /* Put objects in inventory onto this space */
870 while (inv) 815 while (inv)
871 { 816 {
… …
876 || op->type == RUNE 821 || op->type == RUNE
877 || op->type == TRAP 822 || op->type == TRAP
878 || op->flag [FLAG_IS_A_TEMPLATE]) 823 || op->flag [FLAG_IS_A_TEMPLATE])
879 op->destroy (); 824 op->destroy ();
880 else 825 else
881 { 826 map->insert (op, x, y);
882 op->remove ();
883 op->x = x;
884 op->y = y;
885 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
886 } 827 }
828 }
829}
830
831object *object::create ()
832{
833 object *op = new object;
834 op->link ();
835 return op;
836}
837
838void
839object::do_destroy ()
840{
841 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this);
843
844 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this);
846
847 if (!flag [FLAG_REMOVED])
848 remove ();
849
850 if (flag [FLAG_FREED])
851 return;
852
853 set_speed (0);
854
855 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861
862 // hack to ensure that freed objects still have a valid map
863 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes
865
866 if (!freed_map)
867 {
868 freed_map = new maptile;
869
870 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3;
872 freed_map->height = 3;
873
874 freed_map->alloc ();
887 } 875 }
876
877 map = freed_map;
878 x = 1;
879 y = 1;
880 }
881
882 head = 0;
883
884 if (more)
888 } 885 {
886 more->destroy ();
887 more = 0;
888 }
889
890 // clear those pointers that likely might have circular references to us
891 owner = 0;
892 enemy = 0;
893 attacked_by = 0;
894
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
889} 897}
890 898
891void 899void
892object::destroy (bool destroy_inventory) 900object::destroy (bool destroy_inventory)
893{ 901{
894 if (destroyed ()) 902 if (destroyed ())
895 return; 903 return;
896 904
897 if (destroy_inventory) 905 if (destroy_inventory)
898 destroy_inv (true); 906 destroy_inv (false);
899 907
900 attachable::destroy (); 908 attachable::destroy ();
901} 909}
902 910
903/* 911/*
… …
956 * to save cpu time. 964 * to save cpu time.
957 */ 965 */
958 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
959 otmp->update_stats (); 967 otmp->update_stats ();
960 968
961 if (above != NULL) 969 if (above)
962 above->below = below; 970 above->below = below;
963 else 971 else
964 env->inv = below; 972 env->inv = below;
965 973
966 if (below != NULL) 974 if (below)
967 below->above = above; 975 below->above = above;
968 976
969 /* we set up values so that it could be inserted into 977 /* we set up values so that it could be inserted into
970 * the map, but we don't actually do that - it is up 978 * the map, but we don't actually do that - it is up
971 * to the caller to decide what we want to do. 979 * to the caller to decide what we want to do.
… …
975 above = 0, below = 0; 983 above = 0, below = 0;
976 env = 0; 984 env = 0;
977 } 985 }
978 else if (map) 986 else if (map)
979 { 987 {
980 /* Re did the following section of code - it looks like it had 988 if (type == PLAYER)
981 * lots of logic for things we no longer care about
982 */ 989 {
990 --map->players;
991 map->touch ();
992 }
993
994 map->dirty = true;
983 995
984 /* link the object above us */ 996 /* link the object above us */
985 if (above) 997 if (above)
986 above->below = below; 998 above->below = below;
987 else 999 else
… …
1016 if (map->in_memory == MAP_SAVING) 1028 if (map->in_memory == MAP_SAVING)
1017 return; 1029 return;
1018 1030
1019 int check_walk_off = !flag [FLAG_NO_APPLY]; 1031 int check_walk_off = !flag [FLAG_NO_APPLY];
1020 1032
1021 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1022 { 1034 {
1023 /* No point updating the players look faces if he is the object 1035 /* No point updating the players look faces if he is the object
1024 * being removed. 1036 * being removed.
1025 */ 1037 */
1026 1038
… …
1038 1050
1039 if (tmp->contr->ns) 1051 if (tmp->contr->ns)
1040 tmp->contr->ns->floorbox_update (); 1052 tmp->contr->ns->floorbox_update ();
1041 } 1053 }
1042 1054
1043 /* See if player moving off should effect something */ 1055 /* See if object moving off should effect something */
1044 if (check_walk_off 1056 if (check_walk_off
1045 && ((move_type & tmp->move_off) 1057 && ((move_type & tmp->move_off)
1046 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1058 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1047 { 1059 {
1048 move_apply (tmp, this, 0); 1060 move_apply (tmp, this, 0);
… …
1050 if (destroyed ()) 1062 if (destroyed ())
1051 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1063 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1052 } 1064 }
1053 1065
1054 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1066 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1055 1067 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1056 if (tmp->above == tmp) 1068 if (tmp->above == tmp)
1057 tmp->above = 0; 1069 tmp->above = 0;
1058 1070
1059 last = tmp; 1071 last = tmp;
1060 } 1072 }
1061 1073
1062 /* last == NULL of there are no objects on this space */ 1074 /* last == NULL if there are no objects on this space */
1075 //TODO: this makes little sense, why only update the topmost object?
1063 if (!last) 1076 if (!last)
1064 map->at (x, y).flags_ = P_NEED_UPDATE; 1077 map->at (x, y).flags_ = 0;
1065 else 1078 else
1066 update_object (last, UP_OBJ_REMOVE); 1079 update_object (last, UP_OBJ_REMOVE);
1067 1080
1068 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1081 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1069 update_all_los (map, x, y); 1082 update_all_los (map, x, y);
… …
1112 * job preparing multi-part monsters 1125 * job preparing multi-part monsters
1113 */ 1126 */
1114object * 1127object *
1115insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1116{ 1129{
1117 object *tmp;
1118
1119 if (op->head)
1120 op = op->head;
1121
1122 for (tmp = op; tmp; tmp = tmp->more) 1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1123 { 1131 {
1124 tmp->x = x + tmp->arch->clone.x; 1132 tmp->x = x + tmp->arch->clone.x;
1125 tmp->y = y + tmp->arch->clone.y; 1133 tmp->y = y + tmp->arch->clone.y;
1126 } 1134 }
1127 1135
… …
1158 { 1166 {
1159 LOG (llevError, "Trying to insert freed object!\n"); 1167 LOG (llevError, "Trying to insert freed object!\n");
1160 return NULL; 1168 return NULL;
1161 } 1169 }
1162 1170
1163 if (m == NULL) 1171 if (!m)
1164 { 1172 {
1165 char *dump = dump_object (op); 1173 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1167 free (dump); 1175 free (dump);
1168 return op; 1176 return op;
… …
1232 y = op->y; 1240 y = op->y;
1233 1241
1234 /* this has to be done after we translate the coordinates. 1242 /* this has to be done after we translate the coordinates.
1235 */ 1243 */
1236 if (op->nrof && !(flag & INS_NO_MERGE)) 1244 if (op->nrof && !(flag & INS_NO_MERGE))
1237 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1238 if (object::can_merge (op, tmp)) 1246 if (object::can_merge (op, tmp))
1239 { 1247 {
1240 op->nrof += tmp->nrof; 1248 op->nrof += tmp->nrof;
1241 tmp->destroy (); 1249 tmp->destroy ();
1242 } 1250 }
… …
1269 else 1277 else
1270 { 1278 {
1271 /* If there are other objects, then */ 1279 /* If there are other objects, then */
1272 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1273 { 1281 {
1274 object *last = NULL; 1282 object *last = 0;
1275 1283
1276 /* 1284 /*
1277 * If there are multiple objects on this space, we do some trickier handling. 1285 * If there are multiple objects on this space, we do some trickier handling.
1278 * We've already dealt with merging if appropriate. 1286 * We've already dealt with merging if appropriate.
1279 * Generally, we want to put the new object on top. But if 1287 * Generally, we want to put the new object on top. But if
… …
1283 * once we get to them. This reduces the need to traverse over all of 1291 * once we get to them. This reduces the need to traverse over all of
1284 * them when adding another one - this saves quite a bit of cpu time 1292 * them when adding another one - this saves quite a bit of cpu time
1285 * when lots of spells are cast in one area. Currently, it is presumed 1293 * when lots of spells are cast in one area. Currently, it is presumed
1286 * that flying non pickable objects are spell objects. 1294 * that flying non pickable objects are spell objects.
1287 */ 1295 */
1288
1289 while (top != NULL) 1296 while (top)
1290 { 1297 {
1291 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1298 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1292 floor = top; 1299 floor = top;
1293 1300
1294 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1301 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1347 op->above = GET_MAP_OB (op->map, op->x, op->y); 1354 op->above = GET_MAP_OB (op->map, op->x, op->y);
1348 1355
1349 if (op->above) 1356 if (op->above)
1350 op->above->below = op; 1357 op->above->below = op;
1351 1358
1352 op->below = NULL; 1359 op->below = 0;
1353 op->ms ().bot = op; 1360 op->ms ().bot = op;
1354 } 1361 }
1355 else 1362 else
1356 { /* get inserted into the stack above top */ 1363 { /* get inserted into the stack above top */
1357 op->above = top->above; 1364 op->above = top->above;
… …
1361 1368
1362 op->below = top; 1369 op->below = top;
1363 top->above = op; 1370 top->above = op;
1364 } 1371 }
1365 1372
1366 if (op->above == NULL) 1373 if (!op->above)
1367 op->ms ().top = op; 1374 op->ms ().top = op;
1368 } /* else not INS_BELOW_ORIGINATOR */ 1375 } /* else not INS_BELOW_ORIGINATOR */
1369 1376
1370 if (op->type == PLAYER) 1377 if (op->type == PLAYER)
1378 {
1371 op->contr->do_los = 1; 1379 op->contr->do_los = 1;
1380 ++op->map->players;
1381 op->map->touch ();
1382 }
1383
1384 op->map->dirty = true;
1372 1385
1373 /* If we have a floor, we know the player, if any, will be above 1386 /* If we have a floor, we know the player, if any, will be above
1374 * it, so save a few ticks and start from there. 1387 * it, so save a few ticks and start from there.
1375 */ 1388 */
1376 if (!(flag & INS_MAP_LOAD)) 1389 if (!(flag & INS_MAP_LOAD))
… …
1382 * visible to others on this map. But update_all_los is really 1395 * visible to others on this map. But update_all_los is really
1383 * an inefficient way to do this, as it means los for all players 1396 * an inefficient way to do this, as it means los for all players
1384 * on the map will get recalculated. The players could very well 1397 * on the map will get recalculated. The players could very well
1385 * be far away from this change and not affected in any way - 1398 * be far away from this change and not affected in any way -
1386 * this should get redone to only look for players within range, 1399 * this should get redone to only look for players within range,
1387 * or just updating the P_NEED_UPDATE for spaces within this area 1400 * or just updating the P_UPTODATE for spaces within this area
1388 * of effect may be sufficient. 1401 * of effect may be sufficient.
1389 */ 1402 */
1390 if (op->map->darkness && (op->glow_radius != 0)) 1403 if (op->map->darkness && (op->glow_radius != 0))
1391 update_all_los (op->map, op->x, op->y); 1404 update_all_los (op->map, op->x, op->y);
1392 1405
… …
1441 tmp1->x = op->x; 1454 tmp1->x = op->x;
1442 tmp1->y = op->y; 1455 tmp1->y = op->y;
1443 insert_ob_in_map (tmp1, op->map, op, 0); 1456 insert_ob_in_map (tmp1, op->map, op, 0);
1444} 1457}
1445 1458
1459object *
1460object::insert_at (object *where, object *originator, int flags)
1461{
1462 where->map->insert (this, where->x, where->y, originator, flags);
1463}
1464
1446/* 1465/*
1447 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1448 * is returned contains nr objects, and the remaining parts contains 1467 * is returned contains nr objects, and the remaining parts contains
1449 * the rest (or is removed and freed if that number is 0). 1468 * the rest (or is removed and freed if that number is 0).
1450 * On failure, NULL is returned, and the reason put into the 1469 * On failure, NULL is returned, and the reason put into the
1451 * global static errmsg array. 1470 * global static errmsg array.
1452 */ 1471 */
1453
1454object * 1472object *
1455get_split_ob (object *orig_ob, uint32 nr) 1473get_split_ob (object *orig_ob, uint32 nr)
1456{ 1474{
1457 object *newob; 1475 object *newob;
1458 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1476 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1722 * 1740 *
1723 * MSW 2001-07-08: Check all objects on space, not just those below 1741 * MSW 2001-07-08: Check all objects on space, not just those below
1724 * object being inserted. insert_ob_in_map may not put new objects 1742 * object being inserted. insert_ob_in_map may not put new objects
1725 * on top. 1743 * on top.
1726 */ 1744 */
1727
1728int 1745int
1729check_move_on (object *op, object *originator) 1746check_move_on (object *op, object *originator)
1730{ 1747{
1731 object *tmp; 1748 object *tmp;
1732 maptile *m = op->map; 1749 maptile *m = op->map;
… …
2589 } 2606 }
2590 else 2607 else
2591 item = item->env; 2608 item = item->env;
2592} 2609}
2593 2610
2611
2612const char *
2613object::flag_desc (char *desc, int len) const
2614{
2615 char *p = desc;
2616 bool first = true;
2617
2618 *p = 0;
2619
2620 for (int i = 0; i < NUM_FLAGS; i++)
2621 {
2622 if (len <= 10) // magic constant!
2623 {
2624 snprintf (p, len, ",...");
2625 break;
2626 }
2627
2628 if (flag [i])
2629 {
2630 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2631 len -= cnt;
2632 p += cnt;
2633 first = false;
2634 }
2635 }
2636
2637 return desc;
2638}
2639
2594// return a suitable string describing an objetc in enough detail to find it 2640// return a suitable string describing an object in enough detail to find it
2595const char * 2641const char *
2596object::debug_desc (char *info) const 2642object::debug_desc (char *info) const
2597{ 2643{
2644 char flagdesc[512];
2598 char info2[256 * 3]; 2645 char info2[256 * 4];
2599 char *p = info; 2646 char *p = info;
2600 2647
2601 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2648 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2602 count, 2649 count, uuid.seq,
2603 &name, 2650 &name,
2604 title ? " " : "", 2651 title ? "\",title:" : "",
2605 title ? (const char *)title : ""); 2652 title ? (const char *)title : "",
2653 flag_desc (flagdesc, 512), type);
2606 2654
2607 if (env) 2655 if (env)
2608 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2656 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2609 2657
2610 if (map) 2658 if (map)
2611 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2659 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2612 2660
2613 return info; 2661 return info;
2614} 2662}
2615 2663
2616const char * 2664const char *

Diff Legend

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