… | |
… | |
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 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | bool 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 | |
|
|
544 | void |
542 | void |
545 | update_turn_face (object *op) |
543 | update_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 | */ |
558 | void |
557 | void |
559 | object::set_speed (float speed) |
558 | object::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 (false); |
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 (false); |
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 | */ |
|
|
626 | void |
|
|
627 | remove_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 |
… | |
… | |
778 | |
703 | |
779 | prev = 0; |
704 | prev = 0; |
780 | next = 0; |
705 | next = 0; |
781 | } |
706 | } |
782 | |
707 | |
|
|
708 | void |
|
|
709 | object::activate (bool recursive) |
|
|
710 | { |
|
|
711 | if (has_active_speed ()) |
|
|
712 | { |
|
|
713 | /* If already on active list, don't do anything */ |
|
|
714 | if (active_next || active_prev || this == active_objects) |
|
|
715 | return; |
|
|
716 | |
|
|
717 | /* process_events() expects us to insert the object at the beginning |
|
|
718 | * of the list. */ |
|
|
719 | active_next = active_objects; |
|
|
720 | |
|
|
721 | if (active_next) |
|
|
722 | active_next->active_prev = this; |
|
|
723 | |
|
|
724 | active_objects = this; |
|
|
725 | } |
|
|
726 | |
|
|
727 | if (recursive) |
|
|
728 | for (object *op = inv; op; op = op->above) |
|
|
729 | op->activate (1); |
|
|
730 | } |
|
|
731 | |
|
|
732 | /* This function removes object 'op' from the list of active |
|
|
733 | * objects. |
|
|
734 | * This should only be used for style maps or other such |
|
|
735 | * reference maps where you don't want an object that isn't |
|
|
736 | * in play chewing up cpu time getting processed. |
|
|
737 | * The reverse of this is to call update_ob_speed, which |
|
|
738 | * will do the right thing based on the speed of the object. |
|
|
739 | */ |
|
|
740 | void |
|
|
741 | object::deactivate (bool recursive) |
|
|
742 | { |
|
|
743 | /* If not on the active list, nothing needs to be done */ |
|
|
744 | if (!active_next && !active_prev && this != active_objects) |
|
|
745 | return; |
|
|
746 | |
|
|
747 | if (active_prev == 0) |
|
|
748 | { |
|
|
749 | active_objects = active_next; |
|
|
750 | if (active_next) |
|
|
751 | active_next->active_prev = 0; |
|
|
752 | } |
|
|
753 | else |
|
|
754 | { |
|
|
755 | active_prev->active_next = active_next; |
|
|
756 | if (active_next) |
|
|
757 | active_next->active_prev = active_prev; |
|
|
758 | } |
|
|
759 | |
|
|
760 | active_next = 0; |
|
|
761 | active_prev = 0; |
|
|
762 | |
|
|
763 | if (recursive) |
|
|
764 | for (object *op = inv; op; op = op->above) |
|
|
765 | op->deactivate (1); |
|
|
766 | } |
|
|
767 | |
783 | /* |
768 | /* |
784 | * Remove and free all objects in the inventory of the given object. |
769 | * Remove and free all objects in the inventory of the given object. |
785 | * object.c ? |
770 | * object.c ? |
786 | */ |
771 | */ |
787 | void |
772 | void |
788 | object::destroy_inv (bool drop_to_ground) |
773 | object::destroy_inv (bool drop_to_ground) |
789 | { |
774 | { |
|
|
775 | // need to check first, because the checks below might segfault |
|
|
776 | // as we might be on an invalid mapspace and crossfire code |
|
|
777 | // is too buggy to ensure that the inventory is empty. |
|
|
778 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
779 | // cf will crash below with off-map x and y |
|
|
780 | if (!inv) |
|
|
781 | return; |
|
|
782 | |
790 | /* Only if the space blocks everything do we not process - |
783 | /* Only if the space blocks everything do we not process - |
791 | * if some form of movement is allowed, let objects |
784 | * if some form of movement is allowed, let objects |
792 | * drop on that space. |
785 | * drop on that space. |
793 | */ |
786 | */ |
794 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
787 | if (!drop_to_ground |
|
|
788 | || !map |
|
|
789 | || map->in_memory != MAP_IN_MEMORY |
|
|
790 | || ms ().move_block == MOVE_ALL) |
795 | { |
791 | { |
796 | while (inv) |
792 | while (inv) |
|
|
793 | { |
|
|
794 | inv->destroy_inv (drop_to_ground); |
797 | inv->destroy (); |
795 | inv->destroy (); |
|
|
796 | } |
798 | } |
797 | } |
799 | else |
798 | else |
800 | { /* Put objects in inventory onto this space */ |
799 | { /* Put objects in inventory onto this space */ |
801 | while (inv) |
800 | while (inv) |
802 | { |
801 | { |
… | |
… | |
807 | || op->type == RUNE |
806 | || op->type == RUNE |
808 | || op->type == TRAP |
807 | || op->type == TRAP |
809 | || op->flag [FLAG_IS_A_TEMPLATE]) |
808 | || op->flag [FLAG_IS_A_TEMPLATE]) |
810 | op->destroy (); |
809 | op->destroy (); |
811 | else |
810 | else |
812 | { |
811 | map->insert (op, x, y); |
813 | op->remove (); |
|
|
814 | op->x = x; |
|
|
815 | op->y = y; |
|
|
816 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
817 | } |
|
|
818 | } |
812 | } |
819 | } |
813 | } |
820 | } |
814 | } |
821 | |
815 | |
822 | object *object::create () |
816 | object *object::create () |
… | |
… | |
839 | remove (); |
833 | remove (); |
840 | |
834 | |
841 | if (flag [FLAG_FREED]) |
835 | if (flag [FLAG_FREED]) |
842 | return; |
836 | return; |
843 | |
837 | |
|
|
838 | set_speed (0); |
|
|
839 | |
844 | flag [FLAG_FREED] = 1; |
840 | flag [FLAG_FREED] = 1; |
845 | |
841 | |
846 | attachable::do_destroy (); |
842 | attachable::do_destroy (); |
847 | |
843 | |
848 | destroy_inv (true); |
844 | destroy_inv (true); |
849 | set_speed (0); |
|
|
850 | unlink (); |
845 | unlink (); |
851 | |
846 | |
852 | // hack to ensure that freed objects still have a valid map |
847 | // hack to ensure that freed objects still have a valid map |
853 | { |
848 | { |
854 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
849 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
… | |
… | |
859 | |
854 | |
860 | freed_map->name = "/internal/freed_objects_map"; |
855 | freed_map->name = "/internal/freed_objects_map"; |
861 | freed_map->width = 3; |
856 | freed_map->width = 3; |
862 | freed_map->height = 3; |
857 | freed_map->height = 3; |
863 | |
858 | |
864 | freed_map->allocate (); |
859 | freed_map->alloc (); |
865 | } |
860 | } |
866 | |
861 | |
867 | map = freed_map; |
862 | map = freed_map; |
868 | x = 1; |
863 | x = 1; |
869 | y = 1; |
864 | y = 1; |
… | |
… | |
954 | * to save cpu time. |
949 | * to save cpu time. |
955 | */ |
950 | */ |
956 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
951 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
957 | otmp->update_stats (); |
952 | otmp->update_stats (); |
958 | |
953 | |
959 | if (above != NULL) |
954 | if (above) |
960 | above->below = below; |
955 | above->below = below; |
961 | else |
956 | else |
962 | env->inv = below; |
957 | env->inv = below; |
963 | |
958 | |
964 | if (below != NULL) |
959 | if (below) |
965 | below->above = above; |
960 | below->above = above; |
966 | |
961 | |
967 | /* we set up values so that it could be inserted into |
962 | /* we set up values so that it could be inserted into |
968 | * the map, but we don't actually do that - it is up |
963 | * the map, but we don't actually do that - it is up |
969 | * to the caller to decide what we want to do. |
964 | * to the caller to decide what we want to do. |
… | |
… | |
973 | above = 0, below = 0; |
968 | above = 0, below = 0; |
974 | env = 0; |
969 | env = 0; |
975 | } |
970 | } |
976 | else if (map) |
971 | else if (map) |
977 | { |
972 | { |
978 | /* Re did the following section of code - it looks like it had |
973 | if (type == PLAYER) |
979 | * lots of logic for things we no longer care about |
|
|
980 | */ |
974 | { |
|
|
975 | --map->players; |
|
|
976 | map->last_access = runtime; |
|
|
977 | } |
|
|
978 | |
981 | |
979 | |
982 | /* link the object above us */ |
980 | /* link the object above us */ |
983 | if (above) |
981 | if (above) |
984 | above->below = below; |
982 | above->below = below; |
985 | else |
983 | else |
… | |
… | |
1036 | |
1034 | |
1037 | if (tmp->contr->ns) |
1035 | if (tmp->contr->ns) |
1038 | tmp->contr->ns->floorbox_update (); |
1036 | tmp->contr->ns->floorbox_update (); |
1039 | } |
1037 | } |
1040 | |
1038 | |
1041 | /* See if player moving off should effect something */ |
1039 | /* See if object moving off should effect something */ |
1042 | if (check_walk_off |
1040 | if (check_walk_off |
1043 | && ((move_type & tmp->move_off) |
1041 | && ((move_type & tmp->move_off) |
1044 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1042 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1045 | { |
1043 | { |
1046 | move_apply (tmp, this, 0); |
1044 | move_apply (tmp, this, 0); |
… | |
… | |
1048 | if (destroyed ()) |
1046 | if (destroyed ()) |
1049 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1047 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1050 | } |
1048 | } |
1051 | |
1049 | |
1052 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1050 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1053 | |
1051 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1054 | if (tmp->above == tmp) |
1052 | if (tmp->above == tmp) |
1055 | tmp->above = 0; |
1053 | tmp->above = 0; |
1056 | |
1054 | |
1057 | last = tmp; |
1055 | last = tmp; |
1058 | } |
1056 | } |
1059 | |
1057 | |
1060 | /* last == NULL of there are no objects on this space */ |
1058 | /* last == NULL if there are no objects on this space */ |
|
|
1059 | //TODO: this makes little sense, why only update the topmost object? |
1061 | if (!last) |
1060 | if (!last) |
1062 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1061 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1063 | else |
1062 | else |
1064 | update_object (last, UP_OBJ_REMOVE); |
1063 | update_object (last, UP_OBJ_REMOVE); |
1065 | |
1064 | |
… | |
… | |
1110 | * job preparing multi-part monsters |
1109 | * job preparing multi-part monsters |
1111 | */ |
1110 | */ |
1112 | object * |
1111 | object * |
1113 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1112 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1114 | { |
1113 | { |
1115 | object *tmp; |
|
|
1116 | |
|
|
1117 | if (op->head) |
|
|
1118 | op = op->head; |
|
|
1119 | |
|
|
1120 | for (tmp = op; tmp; tmp = tmp->more) |
1114 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1121 | { |
1115 | { |
1122 | tmp->x = x + tmp->arch->clone.x; |
1116 | tmp->x = x + tmp->arch->clone.x; |
1123 | tmp->y = y + tmp->arch->clone.y; |
1117 | tmp->y = y + tmp->arch->clone.y; |
1124 | } |
1118 | } |
1125 | |
1119 | |
… | |
… | |
1156 | { |
1150 | { |
1157 | LOG (llevError, "Trying to insert freed object!\n"); |
1151 | LOG (llevError, "Trying to insert freed object!\n"); |
1158 | return NULL; |
1152 | return NULL; |
1159 | } |
1153 | } |
1160 | |
1154 | |
1161 | if (m == NULL) |
1155 | if (!m) |
1162 | { |
1156 | { |
1163 | char *dump = dump_object (op); |
1157 | char *dump = dump_object (op); |
1164 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1158 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1165 | free (dump); |
1159 | free (dump); |
1166 | return op; |
1160 | return op; |
… | |
… | |
1230 | y = op->y; |
1224 | y = op->y; |
1231 | |
1225 | |
1232 | /* this has to be done after we translate the coordinates. |
1226 | /* this has to be done after we translate the coordinates. |
1233 | */ |
1227 | */ |
1234 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1228 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1235 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1229 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1236 | if (object::can_merge (op, tmp)) |
1230 | if (object::can_merge (op, tmp)) |
1237 | { |
1231 | { |
1238 | op->nrof += tmp->nrof; |
1232 | op->nrof += tmp->nrof; |
1239 | tmp->destroy (); |
1233 | tmp->destroy (); |
1240 | } |
1234 | } |
… | |
… | |
1267 | else |
1261 | else |
1268 | { |
1262 | { |
1269 | /* If there are other objects, then */ |
1263 | /* If there are other objects, then */ |
1270 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1264 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1271 | { |
1265 | { |
1272 | object *last = NULL; |
1266 | object *last = 0; |
1273 | |
1267 | |
1274 | /* |
1268 | /* |
1275 | * If there are multiple objects on this space, we do some trickier handling. |
1269 | * If there are multiple objects on this space, we do some trickier handling. |
1276 | * We've already dealt with merging if appropriate. |
1270 | * We've already dealt with merging if appropriate. |
1277 | * Generally, we want to put the new object on top. But if |
1271 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1281 | * once we get to them. This reduces the need to traverse over all of |
1275 | * once we get to them. This reduces the need to traverse over all of |
1282 | * them when adding another one - this saves quite a bit of cpu time |
1276 | * them when adding another one - this saves quite a bit of cpu time |
1283 | * when lots of spells are cast in one area. Currently, it is presumed |
1277 | * when lots of spells are cast in one area. Currently, it is presumed |
1284 | * that flying non pickable objects are spell objects. |
1278 | * that flying non pickable objects are spell objects. |
1285 | */ |
1279 | */ |
1286 | |
|
|
1287 | while (top != NULL) |
1280 | while (top) |
1288 | { |
1281 | { |
1289 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1282 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1290 | floor = top; |
1283 | floor = top; |
1291 | |
1284 | |
1292 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1285 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1345 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1338 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1346 | |
1339 | |
1347 | if (op->above) |
1340 | if (op->above) |
1348 | op->above->below = op; |
1341 | op->above->below = op; |
1349 | |
1342 | |
1350 | op->below = NULL; |
1343 | op->below = 0; |
1351 | op->ms ().bot = op; |
1344 | op->ms ().bot = op; |
1352 | } |
1345 | } |
1353 | else |
1346 | else |
1354 | { /* get inserted into the stack above top */ |
1347 | { /* get inserted into the stack above top */ |
1355 | op->above = top->above; |
1348 | op->above = top->above; |
… | |
… | |
1359 | |
1352 | |
1360 | op->below = top; |
1353 | op->below = top; |
1361 | top->above = op; |
1354 | top->above = op; |
1362 | } |
1355 | } |
1363 | |
1356 | |
1364 | if (op->above == NULL) |
1357 | if (!op->above) |
1365 | op->ms ().top = op; |
1358 | op->ms ().top = op; |
1366 | } /* else not INS_BELOW_ORIGINATOR */ |
1359 | } /* else not INS_BELOW_ORIGINATOR */ |
1367 | |
1360 | |
1368 | if (op->type == PLAYER) |
1361 | if (op->type == PLAYER) |
|
|
1362 | { |
1369 | op->contr->do_los = 1; |
1363 | op->contr->do_los = 1; |
|
|
1364 | ++op->map->players; |
|
|
1365 | op->map->last_access = runtime; |
|
|
1366 | } |
1370 | |
1367 | |
1371 | /* If we have a floor, we know the player, if any, will be above |
1368 | /* If we have a floor, we know the player, if any, will be above |
1372 | * it, so save a few ticks and start from there. |
1369 | * it, so save a few ticks and start from there. |
1373 | */ |
1370 | */ |
1374 | if (!(flag & INS_MAP_LOAD)) |
1371 | if (!(flag & INS_MAP_LOAD)) |
… | |
… | |
1439 | tmp1->x = op->x; |
1436 | tmp1->x = op->x; |
1440 | tmp1->y = op->y; |
1437 | tmp1->y = op->y; |
1441 | insert_ob_in_map (tmp1, op->map, op, 0); |
1438 | insert_ob_in_map (tmp1, op->map, op, 0); |
1442 | } |
1439 | } |
1443 | |
1440 | |
|
|
1441 | object * |
|
|
1442 | object::insert_at (object *where, object *originator, int flags) |
|
|
1443 | { |
|
|
1444 | where->map->insert (this, where->x, where->y, originator, flags); |
|
|
1445 | } |
|
|
1446 | |
1444 | /* |
1447 | /* |
1445 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1448 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1446 | * is returned contains nr objects, and the remaining parts contains |
1449 | * is returned contains nr objects, and the remaining parts contains |
1447 | * the rest (or is removed and freed if that number is 0). |
1450 | * the rest (or is removed and freed if that number is 0). |
1448 | * On failure, NULL is returned, and the reason put into the |
1451 | * On failure, NULL is returned, and the reason put into the |
1449 | * global static errmsg array. |
1452 | * global static errmsg array. |
1450 | */ |
1453 | */ |
1451 | |
|
|
1452 | object * |
1454 | object * |
1453 | get_split_ob (object *orig_ob, uint32 nr) |
1455 | get_split_ob (object *orig_ob, uint32 nr) |
1454 | { |
1456 | { |
1455 | object *newob; |
1457 | object *newob; |
1456 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1458 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1720 | * |
1722 | * |
1721 | * MSW 2001-07-08: Check all objects on space, not just those below |
1723 | * MSW 2001-07-08: Check all objects on space, not just those below |
1722 | * object being inserted. insert_ob_in_map may not put new objects |
1724 | * object being inserted. insert_ob_in_map may not put new objects |
1723 | * on top. |
1725 | * on top. |
1724 | */ |
1726 | */ |
1725 | |
|
|
1726 | int |
1727 | int |
1727 | check_move_on (object *op, object *originator) |
1728 | check_move_on (object *op, object *originator) |
1728 | { |
1729 | { |
1729 | object *tmp; |
1730 | object *tmp; |
1730 | maptile *m = op->map; |
1731 | maptile *m = op->map; |
… | |
… | |
2587 | } |
2588 | } |
2588 | else |
2589 | else |
2589 | item = item->env; |
2590 | item = item->env; |
2590 | } |
2591 | } |
2591 | |
2592 | |
|
|
2593 | |
|
|
2594 | const char * |
|
|
2595 | object::flag_desc (char *desc, int len) const |
|
|
2596 | { |
|
|
2597 | char *p = desc; |
|
|
2598 | bool first = true; |
|
|
2599 | |
|
|
2600 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2601 | { |
|
|
2602 | if (len <= 10) // magic constant! |
|
|
2603 | { |
|
|
2604 | snprintf (p, len, ",..."); |
|
|
2605 | break; |
|
|
2606 | } |
|
|
2607 | |
|
|
2608 | if (flag[i]) |
|
|
2609 | { |
|
|
2610 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2611 | len -= cnt; |
|
|
2612 | p += cnt; |
|
|
2613 | first = false; |
|
|
2614 | } |
|
|
2615 | } |
|
|
2616 | |
|
|
2617 | return desc; |
|
|
2618 | } |
|
|
2619 | |
2592 | // return a suitable string describing an objetc in enough detail to find it |
2620 | // return a suitable string describing an objetc in enough detail to find it |
2593 | const char * |
2621 | const char * |
2594 | object::debug_desc (char *info) const |
2622 | object::debug_desc (char *info) const |
2595 | { |
2623 | { |
|
|
2624 | char flagdesc[512]; |
2596 | char info2[256 * 3]; |
2625 | char info2[256 * 4]; |
2597 | char *p = info; |
2626 | char *p = info; |
2598 | |
2627 | |
2599 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2628 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2600 | count, |
2629 | count, uuid.seq, |
2601 | &name, |
2630 | &name, |
2602 | title ? " " : "", |
2631 | title ? "\",title:" : "", |
2603 | title ? (const char *)title : ""); |
2632 | title ? (const char *)title : "", |
|
|
2633 | flag_desc (flagdesc, 512), type); |
2604 | |
2634 | |
2605 | if (env) |
2635 | if (env) |
2606 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2636 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2607 | |
2637 | |
2608 | if (map) |
2638 | if (map) |
2609 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2639 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2610 | |
2640 | |
2611 | return info; |
2641 | return info; |
2612 | } |
2642 | } |
2613 | |
2643 | |
2614 | const char * |
2644 | const char * |