… | |
… | |
141 | * objects with lists are rare, and lists stay short. If not, use a |
141 | * objects with lists are rare, and lists stay short. If not, use a |
142 | * different structure or at least keep the lists sorted... |
142 | * different structure or at least keep the lists sorted... |
143 | */ |
143 | */ |
144 | |
144 | |
145 | /* For each field in wants, */ |
145 | /* For each field in wants, */ |
146 | for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) |
146 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
147 | { |
147 | { |
148 | key_value *has_field; |
148 | key_value *has_field; |
149 | |
149 | |
150 | /* Look for a field in has with the same key. */ |
150 | /* Look for a field in has with the same key. */ |
151 | has_field = get_ob_key_link (has, wants_field->key); |
151 | has_field = get_ob_key_link (has, wants_field->key); |
… | |
… | |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
221 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
222 | |
222 | |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
223 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
224 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
225 | |
225 | |
226 | if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
226 | if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () |
227 | || ob1->arch != ob2->arch |
227 | || ob1->arch != ob2->arch |
228 | || ob1->name != ob2->name |
228 | || ob1->name != ob2->name |
229 | || ob1->title != ob2->title |
229 | || ob1->title != ob2->title |
230 | || ob1->msg != ob2->msg |
230 | || ob1->msg != ob2->msg |
231 | || ob1->weight != ob2->weight |
231 | || ob1->weight != ob2->weight |
… | |
… | |
364 | { |
364 | { |
365 | if (!op) |
365 | if (!op) |
366 | return strdup ("[NULLOBJ]"); |
366 | return strdup ("[NULLOBJ]"); |
367 | |
367 | |
368 | object_freezer freezer; |
368 | object_freezer freezer; |
369 | save_object (freezer, op, 3); |
369 | save_object (freezer, op, 1); |
370 | return freezer.as_string (); |
370 | return freezer.as_string (); |
371 | } |
371 | } |
372 | |
372 | |
373 | /* |
373 | /* |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
482 | { |
482 | { |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
485 | |
485 | |
486 | *(object_copy *)dst = *this; |
486 | *(object_copy *)dst = *this; |
487 | *(object_pod *)dst = *this; |
|
|
488 | |
|
|
489 | if (self || cb) |
|
|
490 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
|
|
491 | |
487 | |
492 | if (is_freed) |
488 | if (is_freed) |
493 | SET_FLAG (dst, FLAG_FREED); |
489 | SET_FLAG (dst, FLAG_FREED); |
494 | |
490 | |
495 | if (is_removed) |
491 | if (is_removed) |
… | |
… | |
526 | tail = new_link; |
522 | tail = new_link; |
527 | } |
523 | } |
528 | } |
524 | } |
529 | } |
525 | } |
530 | |
526 | |
531 | update_ob_speed (dst); |
527 | dst->set_speed (dst->speed); |
532 | } |
528 | } |
533 | |
529 | |
534 | object * |
530 | object * |
535 | object::clone () |
531 | object::clone () |
536 | { |
532 | { |
… | |
… | |
558 | * 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 |
559 | * 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. |
560 | * 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. |
561 | */ |
557 | */ |
562 | void |
558 | void |
563 | update_ob_speed (object *op) |
559 | object::set_speed (float speed) |
564 | { |
560 | { |
565 | extern int arch_init; |
561 | extern int arch_init; |
566 | |
562 | |
567 | /* No reason putting the archetypes objects on the speed list, |
563 | /* No reason putting the archetypes objects on the speed list, |
568 | * since they never really need to be updated. |
564 | * since they never really need to be updated. |
569 | */ |
565 | */ |
570 | |
566 | if (flag [FLAG_FREED] && speed) |
571 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
572 | { |
567 | { |
573 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
568 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
574 | #ifdef MANY_CORES |
|
|
575 | abort (); |
|
|
576 | #else |
|
|
577 | op->speed = 0; |
569 | speed = 0; |
578 | #endif |
|
|
579 | } |
570 | } |
|
|
571 | |
|
|
572 | this->speed = speed; |
580 | |
573 | |
581 | if (arch_init) |
574 | if (arch_init) |
582 | return; |
575 | return; |
583 | |
576 | |
584 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
577 | if (FABS (speed) > MIN_ACTIVE_SPEED) |
585 | { |
578 | { |
586 | /* If already on active list, don't do anything */ |
579 | /* If already on active list, don't do anything */ |
587 | if (op->active_next || op->active_prev || op == active_objects) |
580 | if (active_next || active_prev || this == active_objects) |
588 | return; |
581 | return; |
589 | |
582 | |
590 | /* process_events() expects us to insert the object at the beginning |
583 | /* process_events() expects us to insert the object at the beginning |
591 | * of the list. */ |
584 | * of the list. */ |
592 | op->active_next = active_objects; |
585 | active_next = active_objects; |
593 | |
586 | |
594 | if (op->active_next != NULL) |
587 | if (active_next) |
595 | op->active_next->active_prev = op; |
588 | active_next->active_prev = this; |
596 | |
589 | |
597 | active_objects = op; |
590 | active_objects = this; |
598 | } |
591 | } |
599 | else |
592 | else |
600 | { |
593 | { |
601 | /* If not on the active list, nothing needs to be done */ |
594 | /* If not on the active list, nothing needs to be done */ |
602 | if (!op->active_next && !op->active_prev && op != active_objects) |
595 | if (!active_next && !active_prev && this != active_objects) |
603 | return; |
596 | return; |
604 | |
597 | |
605 | if (op->active_prev == NULL) |
598 | if (!active_prev) |
606 | { |
599 | { |
607 | active_objects = op->active_next; |
600 | active_objects = active_next; |
608 | |
601 | |
609 | if (op->active_next != NULL) |
602 | if (active_next) |
610 | op->active_next->active_prev = NULL; |
603 | active_next->active_prev = 0; |
611 | } |
604 | } |
612 | else |
605 | else |
613 | { |
606 | { |
614 | op->active_prev->active_next = op->active_next; |
607 | active_prev->active_next = active_next; |
615 | |
608 | |
616 | if (op->active_next) |
609 | if (active_next) |
617 | op->active_next->active_prev = op->active_prev; |
610 | active_next->active_prev = active_prev; |
618 | } |
611 | } |
619 | |
612 | |
620 | op->active_next = NULL; |
613 | active_next = 0; |
621 | op->active_prev = NULL; |
614 | active_prev = 0; |
622 | } |
615 | } |
623 | } |
616 | } |
624 | |
617 | |
625 | /* This function removes object 'op' from the list of active |
618 | /* This function removes object 'op' from the list of active |
626 | * objects. |
619 | * objects. |
… | |
… | |
695 | */ |
688 | */ |
696 | if (!op->map || op->map->in_memory == MAP_SAVING) |
689 | if (!op->map || op->map->in_memory == MAP_SAVING) |
697 | return; |
690 | return; |
698 | |
691 | |
699 | /* make sure the object is within map boundaries */ |
692 | /* make sure the object is within map boundaries */ |
700 | if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) |
693 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
701 | { |
694 | { |
702 | LOG (llevError, "update_object() called for object out of map!\n"); |
695 | LOG (llevError, "update_object() called for object out of map!\n"); |
703 | #ifdef MANY_CORES |
696 | #ifdef MANY_CORES |
704 | abort (); |
697 | abort (); |
705 | #endif |
698 | #endif |
… | |
… | |
742 | |
735 | |
743 | if (op->more) |
736 | if (op->more) |
744 | update_object (op->more, action); |
737 | update_object (op->more, action); |
745 | } |
738 | } |
746 | |
739 | |
747 | object::vector object::mortals; |
|
|
748 | object::vector object::objects; // not yet used |
740 | object::vector object::objects; // not yet used |
749 | object *object::first; |
741 | object *object::first; |
750 | |
|
|
751 | void object::free_mortals () |
|
|
752 | { |
|
|
753 | for (AUTODECL (i, mortals.begin ()); i != mortals.end ();) |
|
|
754 | if ((*i)->refcnt) |
|
|
755 | ++i; // further delay freeing |
|
|
756 | else |
|
|
757 | { |
|
|
758 | delete *i; |
|
|
759 | mortals.erase (i); |
|
|
760 | } |
|
|
761 | } |
|
|
762 | |
742 | |
763 | object::object () |
743 | object::object () |
764 | { |
744 | { |
765 | SET_FLAG (this, FLAG_REMOVED); |
745 | SET_FLAG (this, FLAG_REMOVED); |
766 | |
746 | |
… | |
… | |
798 | |
778 | |
799 | prev = 0; |
779 | prev = 0; |
800 | next = 0; |
780 | next = 0; |
801 | } |
781 | } |
802 | |
782 | |
|
|
783 | /* |
|
|
784 | * Remove and free all objects in the inventory of the given object. |
|
|
785 | * object.c ? |
|
|
786 | */ |
|
|
787 | void |
|
|
788 | object::destroy_inv (bool drop_to_ground) |
|
|
789 | { |
|
|
790 | /* Only if the space blocks everything do we not process - |
|
|
791 | * if some form of movement is allowed, let objects |
|
|
792 | * drop on that space. |
|
|
793 | */ |
|
|
794 | if (!drop_to_ground |
|
|
795 | || !map |
|
|
796 | || map->in_memory != MAP_IN_MEMORY |
|
|
797 | || map->at (x, y).move_block == MOVE_ALL) |
|
|
798 | { |
|
|
799 | while (inv) |
|
|
800 | { |
|
|
801 | inv->destroy_inv (drop_to_ground); |
|
|
802 | inv->destroy (); |
|
|
803 | } |
|
|
804 | } |
|
|
805 | else |
|
|
806 | { /* Put objects in inventory onto this space */ |
|
|
807 | while (inv) |
|
|
808 | { |
|
|
809 | object *op = inv; |
|
|
810 | |
|
|
811 | if (op->flag [FLAG_STARTEQUIP] |
|
|
812 | || op->flag [FLAG_NO_DROP] |
|
|
813 | || op->type == RUNE |
|
|
814 | || op->type == TRAP |
|
|
815 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
816 | op->destroy (); |
|
|
817 | else |
|
|
818 | { |
|
|
819 | op->remove (); |
|
|
820 | op->x = x; |
|
|
821 | op->y = y; |
|
|
822 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
823 | } |
|
|
824 | } |
|
|
825 | } |
|
|
826 | } |
|
|
827 | |
803 | object *object::create () |
828 | object *object::create () |
804 | { |
829 | { |
805 | object *op = new object; |
830 | object *op = new object; |
806 | op->link (); |
831 | op->link (); |
807 | return op; |
832 | return op; |
808 | } |
833 | } |
809 | |
834 | |
810 | /* |
835 | void |
811 | * free_object() frees everything allocated by an object, removes |
836 | object::do_destroy () |
812 | * it from the list of used objects, and puts it on the list of |
|
|
813 | * free objects. The IS_FREED() flag is set in the object. |
|
|
814 | * The object must have been removed by remove_ob() first for |
|
|
815 | * this function to succeed. |
|
|
816 | * |
|
|
817 | * If destroy_inventory is set, free inventory as well. Else drop items in |
|
|
818 | * inventory to the ground. |
|
|
819 | */ |
|
|
820 | void object::destroy (bool destroy_inventory) |
|
|
821 | { |
837 | { |
822 | if (QUERY_FLAG (this, FLAG_FREED)) |
838 | if (flag [FLAG_IS_LINKED]) |
|
|
839 | remove_button_link (this); |
|
|
840 | |
|
|
841 | if (flag [FLAG_FRIENDLY]) |
|
|
842 | remove_friendly_object (this); |
|
|
843 | |
|
|
844 | if (!flag [FLAG_REMOVED]) |
|
|
845 | remove (); |
|
|
846 | |
|
|
847 | if (flag [FLAG_FREED]) |
823 | return; |
848 | return; |
824 | |
849 | |
825 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
850 | set_speed (0); |
826 | remove_friendly_object (this); |
|
|
827 | |
851 | |
828 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
852 | flag [FLAG_FREED] = 1; |
829 | remove (); |
|
|
830 | |
853 | |
831 | SET_FLAG (this, FLAG_FREED); |
854 | attachable::do_destroy (); |
832 | |
855 | |
833 | if (more) |
856 | destroy_inv (true); |
834 | { |
857 | unlink (); |
835 | more->destroy (destroy_inventory); |
|
|
836 | more = 0; |
|
|
837 | } |
|
|
838 | |
|
|
839 | if (inv) |
|
|
840 | { |
|
|
841 | /* Only if the space blocks everything do we not process - |
|
|
842 | * if some form of movement is allowed, let objects |
|
|
843 | * drop on that space. |
|
|
844 | */ |
|
|
845 | if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
|
|
846 | { |
|
|
847 | object *op = inv; |
|
|
848 | |
|
|
849 | while (op) |
|
|
850 | { |
|
|
851 | object *tmp = op->below; |
|
|
852 | op->destroy (destroy_inventory); |
|
|
853 | op = tmp; |
|
|
854 | } |
|
|
855 | } |
|
|
856 | else |
|
|
857 | { /* Put objects in inventory onto this space */ |
|
|
858 | object *op = inv; |
|
|
859 | |
|
|
860 | while (op) |
|
|
861 | { |
|
|
862 | object *tmp = op->below; |
|
|
863 | |
|
|
864 | op->remove (); |
|
|
865 | |
|
|
866 | if (QUERY_FLAG (op, FLAG_STARTEQUIP) |
|
|
867 | || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) |
|
|
868 | op->destroy (); |
|
|
869 | else |
|
|
870 | { |
|
|
871 | op->x = x; |
|
|
872 | op->y = y; |
|
|
873 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
874 | } |
|
|
875 | |
|
|
876 | op = tmp; |
|
|
877 | } |
|
|
878 | } |
|
|
879 | } |
|
|
880 | |
858 | |
881 | // hack to ensure that freed objects still have a valid map |
859 | // hack to ensure that freed objects still have a valid map |
882 | { |
860 | { |
883 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
861 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
884 | |
862 | |
… | |
… | |
896 | map = freed_map; |
874 | map = freed_map; |
897 | x = 1; |
875 | x = 1; |
898 | y = 1; |
876 | y = 1; |
899 | } |
877 | } |
900 | |
878 | |
|
|
879 | head = 0; |
|
|
880 | |
|
|
881 | if (more) |
|
|
882 | { |
|
|
883 | more->destroy (); |
|
|
884 | more = 0; |
|
|
885 | } |
|
|
886 | |
901 | // clear those pointers that likely might have circular references to us |
887 | // clear those pointers that likely might have circular references to us |
902 | owner = 0; |
888 | owner = 0; |
903 | enemy = 0; |
889 | enemy = 0; |
904 | attacked_by = 0; |
890 | attacked_by = 0; |
905 | |
891 | |
906 | // only relevant for players(?), but make sure of it anyways |
892 | // only relevant for players(?), but make sure of it anyways |
907 | contr = 0; |
893 | contr = 0; |
|
|
894 | } |
908 | |
895 | |
909 | /* Remove object from the active list */ |
896 | void |
910 | speed = 0; |
897 | object::destroy (bool destroy_inventory) |
911 | update_ob_speed (this); |
898 | { |
|
|
899 | if (destroyed ()) |
|
|
900 | return; |
912 | |
901 | |
913 | unlink (); |
902 | if (destroy_inventory) |
|
|
903 | destroy_inv (false); |
914 | |
904 | |
915 | mortals.push_back (this); |
905 | attachable::destroy (); |
916 | } |
906 | } |
917 | |
907 | |
918 | /* |
908 | /* |
919 | * sub_weight() recursively (outwards) subtracts a number from the |
909 | * sub_weight() recursively (outwards) subtracts a number from the |
920 | * weight of an object (and what is carried by it's environment(s)). |
910 | * weight of an object (and what is carried by it's environment(s)). |
… | |
… | |
944 | object::remove () |
934 | object::remove () |
945 | { |
935 | { |
946 | object *tmp, *last = 0; |
936 | object *tmp, *last = 0; |
947 | object *otmp; |
937 | object *otmp; |
948 | |
938 | |
949 | int check_walk_off; |
|
|
950 | |
|
|
951 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
939 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
952 | return; |
940 | return; |
953 | |
941 | |
954 | SET_FLAG (this, FLAG_REMOVED); |
942 | SET_FLAG (this, FLAG_REMOVED); |
|
|
943 | INVOKE_OBJECT (REMOVE, this); |
955 | |
944 | |
956 | if (more) |
945 | if (more) |
957 | more->remove (); |
946 | more->remove (); |
958 | |
947 | |
959 | /* |
948 | /* |
… | |
… | |
1021 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1010 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1022 | LOG (llevError, "%s\n", dump); |
1011 | LOG (llevError, "%s\n", dump); |
1023 | free (dump); |
1012 | free (dump); |
1024 | } |
1013 | } |
1025 | |
1014 | |
1026 | map->at (x, y).bottom = above; /* goes on above it. */ |
1015 | map->at (x, y).bot = above; /* goes on above it. */ |
1027 | } |
1016 | } |
1028 | |
1017 | |
1029 | above = 0; |
1018 | above = 0; |
1030 | below = 0; |
1019 | below = 0; |
1031 | |
1020 | |
1032 | if (map->in_memory == MAP_SAVING) |
1021 | if (map->in_memory == MAP_SAVING) |
1033 | return; |
1022 | return; |
1034 | |
1023 | |
1035 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1024 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1036 | |
1025 | |
1037 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1026 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1038 | { |
1027 | { |
1039 | /* No point updating the players look faces if he is the object |
1028 | /* No point updating the players look faces if he is the object |
1040 | * being removed. |
1029 | * being removed. |
1041 | */ |
1030 | */ |
1042 | |
1031 | |
… | |
… | |
1046 | * removed (most likely destroyed), update the player view |
1035 | * removed (most likely destroyed), update the player view |
1047 | * appropriately. |
1036 | * appropriately. |
1048 | */ |
1037 | */ |
1049 | if (tmp->container == this) |
1038 | if (tmp->container == this) |
1050 | { |
1039 | { |
1051 | CLEAR_FLAG (this, FLAG_APPLIED); |
1040 | flag [FLAG_APPLIED] = 0; |
1052 | tmp->container = 0; |
1041 | tmp->container = 0; |
1053 | } |
1042 | } |
1054 | |
1043 | |
|
|
1044 | if (tmp->contr->ns) |
1055 | tmp->contr->ns->floorbox_update (); |
1045 | tmp->contr->ns->floorbox_update (); |
1056 | } |
1046 | } |
1057 | |
1047 | |
1058 | /* See if player moving off should effect something */ |
1048 | /* See if player moving off should effect something */ |
1059 | if (check_walk_off |
1049 | if (check_walk_off |
1060 | && ((move_type & tmp->move_off) |
1050 | && ((move_type & tmp->move_off) |
… | |
… | |
1078 | if (!last) |
1068 | if (!last) |
1079 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1069 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1080 | else |
1070 | else |
1081 | update_object (last, UP_OBJ_REMOVE); |
1071 | update_object (last, UP_OBJ_REMOVE); |
1082 | |
1072 | |
1083 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1073 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1084 | update_all_los (map, x, y); |
1074 | update_all_los (map, x, y); |
1085 | } |
1075 | } |
1086 | } |
1076 | } |
1087 | |
1077 | |
1088 | /* |
1078 | /* |
… | |
… | |
1097 | merge_ob (object *op, object *top) |
1087 | merge_ob (object *op, object *top) |
1098 | { |
1088 | { |
1099 | if (!op->nrof) |
1089 | if (!op->nrof) |
1100 | return 0; |
1090 | return 0; |
1101 | |
1091 | |
1102 | if (top == NULL) |
1092 | if (top) |
1103 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1093 | for (top = op; top && top->above; top = top->above) |
|
|
1094 | ; |
1104 | |
1095 | |
1105 | for (; top != NULL; top = top->below) |
1096 | for (; top; top = top->below) |
1106 | { |
1097 | { |
1107 | if (top == op) |
1098 | if (top == op) |
1108 | continue; |
1099 | continue; |
1109 | |
1100 | |
1110 | if (object::can_merge (op, top)) |
1101 | if (object::can_merge (op, top)) |
… | |
… | |
1160 | * Return value: |
1151 | * Return value: |
1161 | * new object if 'op' was merged with other object |
1152 | * new object if 'op' was merged with other object |
1162 | * NULL if 'op' was destroyed |
1153 | * NULL if 'op' was destroyed |
1163 | * just 'op' otherwise |
1154 | * just 'op' otherwise |
1164 | */ |
1155 | */ |
1165 | |
|
|
1166 | object * |
1156 | object * |
1167 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1157 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1168 | { |
1158 | { |
1169 | object *tmp, *top, *floor = NULL; |
1159 | object *tmp, *top, *floor = NULL; |
1170 | sint16 x, y; |
1160 | sint16 x, y; |
… | |
… | |
1204 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1194 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1205 | free (dump); |
1195 | free (dump); |
1206 | return op; |
1196 | return op; |
1207 | } |
1197 | } |
1208 | |
1198 | |
1209 | if (op->more != NULL) |
1199 | if (op->more) |
1210 | { |
1200 | { |
1211 | /* The part may be on a different map. */ |
1201 | /* The part may be on a different map. */ |
1212 | |
1202 | |
1213 | object *more = op->more; |
1203 | object *more = op->more; |
1214 | |
1204 | |
… | |
… | |
1230 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1220 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1231 | { |
1221 | { |
1232 | if (!op->head) |
1222 | if (!op->head) |
1233 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1223 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1234 | |
1224 | |
1235 | return NULL; |
1225 | return 0; |
1236 | } |
1226 | } |
1237 | } |
1227 | } |
1238 | |
1228 | |
1239 | CLEAR_FLAG (op, FLAG_REMOVED); |
1229 | CLEAR_FLAG (op, FLAG_REMOVED); |
1240 | |
1230 | |
… | |
… | |
1274 | op->below = originator->below; |
1264 | op->below = originator->below; |
1275 | |
1265 | |
1276 | if (op->below) |
1266 | if (op->below) |
1277 | op->below->above = op; |
1267 | op->below->above = op; |
1278 | else |
1268 | else |
1279 | op->ms ().bottom = op; |
1269 | op->ms ().bot = op; |
1280 | |
1270 | |
1281 | /* since *below* originator, no need to update top */ |
1271 | /* since *below* originator, no need to update top */ |
1282 | originator->below = op; |
1272 | originator->below = op; |
1283 | } |
1273 | } |
1284 | else |
1274 | else |
… | |
… | |
1363 | |
1353 | |
1364 | if (op->above) |
1354 | if (op->above) |
1365 | op->above->below = op; |
1355 | op->above->below = op; |
1366 | |
1356 | |
1367 | op->below = NULL; |
1357 | op->below = NULL; |
1368 | op->ms ().bottom = op; |
1358 | op->ms ().bot = op; |
1369 | } |
1359 | } |
1370 | else |
1360 | else |
1371 | { /* get inserted into the stack above top */ |
1361 | { /* get inserted into the stack above top */ |
1372 | op->above = top->above; |
1362 | op->above = top->above; |
1373 | |
1363 | |
… | |
… | |
1388 | /* If we have a floor, we know the player, if any, will be above |
1378 | /* If we have a floor, we know the player, if any, will be above |
1389 | * it, so save a few ticks and start from there. |
1379 | * it, so save a few ticks and start from there. |
1390 | */ |
1380 | */ |
1391 | if (!(flag & INS_MAP_LOAD)) |
1381 | if (!(flag & INS_MAP_LOAD)) |
1392 | if (object *pl = op->ms ().player ()) |
1382 | if (object *pl = op->ms ().player ()) |
|
|
1383 | if (pl->contr->ns) |
1393 | pl->contr->ns->floorbox_update (); |
1384 | pl->contr->ns->floorbox_update (); |
1394 | |
1385 | |
1395 | /* If this object glows, it may affect lighting conditions that are |
1386 | /* If this object glows, it may affect lighting conditions that are |
1396 | * visible to others on this map. But update_all_los is really |
1387 | * visible to others on this map. But update_all_los is really |
1397 | * an inefficient way to do this, as it means los for all players |
1388 | * an inefficient way to do this, as it means los for all players |
1398 | * on the map will get recalculated. The players could very well |
1389 | * on the map will get recalculated. The players could very well |
1399 | * be far away from this change and not affected in any way - |
1390 | * be far away from this change and not affected in any way - |
1400 | * this should get redone to only look for players within range, |
1391 | * this should get redone to only look for players within range, |
1401 | * or just updating the P_NEED_UPDATE for spaces within this area |
1392 | * or just updating the P_NEED_UPDATE for spaces within this area |
1402 | * of effect may be sufficient. |
1393 | * of effect may be sufficient. |
1403 | */ |
1394 | */ |
1404 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1395 | if (op->map->darkness && (op->glow_radius != 0)) |
1405 | update_all_los (op->map, op->x, op->y); |
1396 | update_all_los (op->map, op->x, op->y); |
1406 | |
1397 | |
1407 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1398 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1408 | update_object (op, UP_OBJ_INSERT); |
1399 | update_object (op, UP_OBJ_INSERT); |
|
|
1400 | |
|
|
1401 | INVOKE_OBJECT (INSERT, op); |
1409 | |
1402 | |
1410 | /* Don't know if moving this to the end will break anything. However, |
1403 | /* Don't know if moving this to the end will break anything. However, |
1411 | * we want to have floorbox_update called before calling this. |
1404 | * we want to have floorbox_update called before calling this. |
1412 | * |
1405 | * |
1413 | * check_move_on() must be after this because code called from |
1406 | * check_move_on() must be after this because code called from |
… | |
… | |
1418 | |
1411 | |
1419 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1412 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1420 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1413 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1421 | { |
1414 | { |
1422 | if (check_move_on (op, originator)) |
1415 | if (check_move_on (op, originator)) |
1423 | return NULL; |
1416 | return 0; |
1424 | |
1417 | |
1425 | /* If we are a multi part object, lets work our way through the check |
1418 | /* If we are a multi part object, lets work our way through the check |
1426 | * walk on's. |
1419 | * walk on's. |
1427 | */ |
1420 | */ |
1428 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1421 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1429 | if (check_move_on (tmp, originator)) |
1422 | if (check_move_on (tmp, originator)) |
1430 | return NULL; |
1423 | return 0; |
1431 | } |
1424 | } |
1432 | |
1425 | |
1433 | return op; |
1426 | return op; |
1434 | } |
1427 | } |
1435 | |
1428 | |
… | |
… | |
1506 | |
1499 | |
1507 | object * |
1500 | object * |
1508 | decrease_ob_nr (object *op, uint32 i) |
1501 | decrease_ob_nr (object *op, uint32 i) |
1509 | { |
1502 | { |
1510 | object *tmp; |
1503 | object *tmp; |
1511 | player *pl; |
|
|
1512 | |
1504 | |
1513 | if (i == 0) /* objects with op->nrof require this check */ |
1505 | if (i == 0) /* objects with op->nrof require this check */ |
1514 | return op; |
1506 | return op; |
1515 | |
1507 | |
1516 | if (i > op->nrof) |
1508 | if (i > op->nrof) |
… | |
… | |
1529 | * IMO, searching through all the players will mostly |
1521 | * IMO, searching through all the players will mostly |
1530 | * likely be quicker than following op->env to the map, |
1522 | * likely be quicker than following op->env to the map, |
1531 | * and then searching the map for a player. |
1523 | * and then searching the map for a player. |
1532 | */ |
1524 | */ |
1533 | if (!tmp) |
1525 | if (!tmp) |
1534 | { |
1526 | for_all_players (pl) |
1535 | for (pl = first_player; pl; pl = pl->next) |
|
|
1536 | if (pl->ob->container == op->env) |
1527 | if (pl->ob->container == op->env) |
1537 | { |
1528 | { |
1538 | tmp = pl->ob; |
1529 | tmp = pl->ob; |
1539 | break; |
1530 | break; |
1540 | } |
1531 | } |
1541 | } |
|
|
1542 | |
1532 | |
1543 | if (i < op->nrof) |
1533 | if (i < op->nrof) |
1544 | { |
1534 | { |
1545 | sub_weight (op->env, op->weight * i); |
1535 | sub_weight (op->env, op->weight * i); |
1546 | op->nrof -= i; |
1536 | op->nrof -= i; |
… | |
… | |
1696 | if ((op->glow_radius != 0) && map) |
1686 | if ((op->glow_radius != 0) && map) |
1697 | { |
1687 | { |
1698 | #ifdef DEBUG_LIGHTS |
1688 | #ifdef DEBUG_LIGHTS |
1699 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1689 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1700 | #endif /* DEBUG_LIGHTS */ |
1690 | #endif /* DEBUG_LIGHTS */ |
1701 | if (MAP_DARKNESS (map)) |
1691 | if (map->darkness) |
1702 | update_all_los (map, x, y); |
1692 | update_all_los (map, x, y); |
1703 | } |
1693 | } |
1704 | |
1694 | |
1705 | /* Client has no idea of ordering so lets not bother ordering it here. |
1695 | /* Client has no idea of ordering so lets not bother ordering it here. |
1706 | * It sure simplifies this function... |
1696 | * It sure simplifies this function... |
… | |
… | |
1711 | { |
1701 | { |
1712 | op->below = inv; |
1702 | op->below = inv; |
1713 | op->below->above = op; |
1703 | op->below->above = op; |
1714 | inv = op; |
1704 | inv = op; |
1715 | } |
1705 | } |
|
|
1706 | |
|
|
1707 | INVOKE_OBJECT (INSERT, this); |
1716 | |
1708 | |
1717 | return op; |
1709 | return op; |
1718 | } |
1710 | } |
1719 | |
1711 | |
1720 | /* |
1712 | /* |
… | |
… | |
1772 | |
1764 | |
1773 | /* The objects have to be checked from top to bottom. |
1765 | /* The objects have to be checked from top to bottom. |
1774 | * Hence, we first go to the top: |
1766 | * Hence, we first go to the top: |
1775 | */ |
1767 | */ |
1776 | |
1768 | |
1777 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1769 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1778 | { |
1770 | { |
1779 | /* Trim the search when we find the first other spell effect |
1771 | /* Trim the search when we find the first other spell effect |
1780 | * this helps performance so that if a space has 50 spell objects, |
1772 | * this helps performance so that if a space has 50 spell objects, |
1781 | * we don't need to check all of them. |
1773 | * we don't need to check all of them. |
1782 | */ |
1774 | */ |
… | |
… | |
1837 | /* |
1829 | /* |
1838 | * present_arch(arch, map, x, y) searches for any objects with |
1830 | * present_arch(arch, map, x, y) searches for any objects with |
1839 | * a matching archetype at the given map and coordinates. |
1831 | * a matching archetype at the given map and coordinates. |
1840 | * The first matching object is returned, or NULL if none. |
1832 | * The first matching object is returned, or NULL if none. |
1841 | */ |
1833 | */ |
1842 | |
|
|
1843 | object * |
1834 | object * |
1844 | present_arch (const archetype *at, maptile *m, int x, int y) |
1835 | present_arch (const archetype *at, maptile *m, int x, int y) |
1845 | { |
1836 | { |
1846 | object * |
|
|
1847 | tmp; |
|
|
1848 | |
|
|
1849 | if (m == NULL || out_of_map (m, x, y)) |
1837 | if (m == NULL || out_of_map (m, x, y)) |
1850 | { |
1838 | { |
1851 | LOG (llevError, "Present_arch called outside map.\n"); |
1839 | LOG (llevError, "Present_arch called outside map.\n"); |
1852 | return NULL; |
1840 | return NULL; |
1853 | } |
1841 | } |
|
|
1842 | |
1854 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1843 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1855 | if (tmp->arch == at) |
1844 | if (tmp->arch == at) |
1856 | return tmp; |
1845 | return tmp; |
|
|
1846 | |
1857 | return NULL; |
1847 | return NULL; |
1858 | } |
1848 | } |
1859 | |
1849 | |
1860 | /* |
1850 | /* |
1861 | * present(type, map, x, y) searches for any objects with |
1851 | * present(type, map, x, y) searches for any objects with |
1862 | * a matching type variable at the given map and coordinates. |
1852 | * a matching type variable at the given map and coordinates. |
1863 | * The first matching object is returned, or NULL if none. |
1853 | * The first matching object is returned, or NULL if none. |
1864 | */ |
1854 | */ |
1865 | |
|
|
1866 | object * |
1855 | object * |
1867 | present (unsigned char type, maptile *m, int x, int y) |
1856 | present (unsigned char type, maptile *m, int x, int y) |
1868 | { |
1857 | { |
1869 | object * |
|
|
1870 | tmp; |
|
|
1871 | |
|
|
1872 | if (out_of_map (m, x, y)) |
1858 | if (out_of_map (m, x, y)) |
1873 | { |
1859 | { |
1874 | LOG (llevError, "Present called outside map.\n"); |
1860 | LOG (llevError, "Present called outside map.\n"); |
1875 | return NULL; |
1861 | return NULL; |
1876 | } |
1862 | } |
|
|
1863 | |
1877 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1864 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1878 | if (tmp->type == type) |
1865 | if (tmp->type == type) |
1879 | return tmp; |
1866 | return tmp; |
|
|
1867 | |
1880 | return NULL; |
1868 | return NULL; |
1881 | } |
1869 | } |
1882 | |
1870 | |
1883 | /* |
1871 | /* |
1884 | * present_in_ob(type, object) searches for any objects with |
1872 | * present_in_ob(type, object) searches for any objects with |
1885 | * a matching type variable in the inventory of the given object. |
1873 | * a matching type variable in the inventory of the given object. |
1886 | * The first matching object is returned, or NULL if none. |
1874 | * The first matching object is returned, or NULL if none. |
1887 | */ |
1875 | */ |
1888 | |
|
|
1889 | object * |
1876 | object * |
1890 | present_in_ob (unsigned char type, const object *op) |
1877 | present_in_ob (unsigned char type, const object *op) |
1891 | { |
1878 | { |
1892 | object * |
|
|
1893 | tmp; |
|
|
1894 | |
|
|
1895 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1879 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1896 | if (tmp->type == type) |
1880 | if (tmp->type == type) |
1897 | return tmp; |
1881 | return tmp; |
|
|
1882 | |
1898 | return NULL; |
1883 | return NULL; |
1899 | } |
1884 | } |
1900 | |
1885 | |
1901 | /* |
1886 | /* |
1902 | * present_in_ob (type, str, object) searches for any objects with |
1887 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
1910 | * str is the string to match against. Note that we match against |
1895 | * str is the string to match against. Note that we match against |
1911 | * the object name, not the archetype name. this is so that the |
1896 | * the object name, not the archetype name. this is so that the |
1912 | * spell code can use one object type (force), but change it's name |
1897 | * spell code can use one object type (force), but change it's name |
1913 | * to be unique. |
1898 | * to be unique. |
1914 | */ |
1899 | */ |
1915 | |
|
|
1916 | object * |
1900 | object * |
1917 | present_in_ob_by_name (int type, const char *str, const object *op) |
1901 | present_in_ob_by_name (int type, const char *str, const object *op) |
1918 | { |
1902 | { |
1919 | object * |
|
|
1920 | tmp; |
|
|
1921 | |
|
|
1922 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1903 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1923 | { |
|
|
1924 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1904 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1925 | return tmp; |
1905 | return tmp; |
1926 | } |
1906 | |
1927 | return NULL; |
1907 | return 0; |
1928 | } |
1908 | } |
1929 | |
1909 | |
1930 | /* |
1910 | /* |
1931 | * present_arch_in_ob(archetype, object) searches for any objects with |
1911 | * present_arch_in_ob(archetype, object) searches for any objects with |
1932 | * a matching archetype in the inventory of the given object. |
1912 | * a matching archetype in the inventory of the given object. |
1933 | * The first matching object is returned, or NULL if none. |
1913 | * The first matching object is returned, or NULL if none. |
1934 | */ |
1914 | */ |
1935 | |
|
|
1936 | object * |
1915 | object * |
1937 | present_arch_in_ob (const archetype *at, const object *op) |
1916 | present_arch_in_ob (const archetype *at, const object *op) |
1938 | { |
1917 | { |
1939 | object * |
|
|
1940 | tmp; |
|
|
1941 | |
|
|
1942 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1918 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1943 | if (tmp->arch == at) |
1919 | if (tmp->arch == at) |
1944 | return tmp; |
1920 | return tmp; |
|
|
1921 | |
1945 | return NULL; |
1922 | return NULL; |
1946 | } |
1923 | } |
1947 | |
1924 | |
1948 | /* |
1925 | /* |
1949 | * activate recursively a flag on an object inventory |
1926 | * activate recursively a flag on an object inventory |
1950 | */ |
1927 | */ |
1951 | void |
1928 | void |
1952 | flag_inv (object *op, int flag) |
1929 | flag_inv (object *op, int flag) |
1953 | { |
1930 | { |
1954 | object * |
|
|
1955 | tmp; |
|
|
1956 | |
|
|
1957 | if (op->inv) |
1931 | if (op->inv) |
1958 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1932 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1959 | { |
1933 | { |
1960 | SET_FLAG (tmp, flag); |
1934 | SET_FLAG (tmp, flag); |
1961 | flag_inv (tmp, flag); |
1935 | flag_inv (tmp, flag); |
1962 | } |
1936 | } |
1963 | } /* |
1937 | } |
|
|
1938 | |
|
|
1939 | /* |
1964 | * desactivate recursively a flag on an object inventory |
1940 | * deactivate recursively a flag on an object inventory |
1965 | */ |
1941 | */ |
1966 | void |
1942 | void |
1967 | unflag_inv (object *op, int flag) |
1943 | unflag_inv (object *op, int flag) |
1968 | { |
1944 | { |
1969 | object * |
|
|
1970 | tmp; |
|
|
1971 | |
|
|
1972 | if (op->inv) |
1945 | if (op->inv) |
1973 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1946 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1974 | { |
1947 | { |
1975 | CLEAR_FLAG (tmp, flag); |
1948 | CLEAR_FLAG (tmp, flag); |
1976 | unflag_inv (tmp, flag); |
1949 | unflag_inv (tmp, flag); |
1977 | } |
1950 | } |
1978 | } |
1951 | } |
… | |
… | |
1981 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1954 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1982 | * all it's inventory (recursively). |
1955 | * all it's inventory (recursively). |
1983 | * If checksums are used, a player will get set_cheat called for |
1956 | * If checksums are used, a player will get set_cheat called for |
1984 | * him/her-self and all object carried by a call to this function. |
1957 | * him/her-self and all object carried by a call to this function. |
1985 | */ |
1958 | */ |
1986 | |
|
|
1987 | void |
1959 | void |
1988 | set_cheat (object *op) |
1960 | set_cheat (object *op) |
1989 | { |
1961 | { |
1990 | SET_FLAG (op, FLAG_WAS_WIZ); |
1962 | SET_FLAG (op, FLAG_WAS_WIZ); |
1991 | flag_inv (op, FLAG_WAS_WIZ); |
1963 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2010 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1982 | * because arch_blocked (now ob_blocked) needs to know the movement type |
2011 | * to know if the space in question will block the object. We can't use |
1983 | * to know if the space in question will block the object. We can't use |
2012 | * the archetype because that isn't correct if the monster has been |
1984 | * the archetype because that isn't correct if the monster has been |
2013 | * customized, changed states, etc. |
1985 | * customized, changed states, etc. |
2014 | */ |
1986 | */ |
2015 | |
|
|
2016 | int |
1987 | int |
2017 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
1988 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2018 | { |
1989 | { |
2019 | int |
|
|
2020 | i, |
|
|
2021 | index = 0, flag; |
1990 | int index = 0, flag; |
2022 | static int |
|
|
2023 | altern[SIZEOFFREE]; |
1991 | int altern[SIZEOFFREE]; |
2024 | |
1992 | |
2025 | for (i = start; i < stop; i++) |
1993 | for (int i = start; i < stop; i++) |
2026 | { |
1994 | { |
2027 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
1995 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2028 | if (!flag) |
1996 | if (!flag) |
2029 | altern[index++] = i; |
1997 | altern [index++] = i; |
2030 | |
1998 | |
2031 | /* Basically, if we find a wall on a space, we cut down the search size. |
1999 | /* Basically, if we find a wall on a space, we cut down the search size. |
2032 | * In this way, we won't return spaces that are on another side of a wall. |
2000 | * In this way, we won't return spaces that are on another side of a wall. |
2033 | * This mostly work, but it cuts down the search size in all directions - |
2001 | * This mostly work, but it cuts down the search size in all directions - |
2034 | * if the space being examined only has a wall to the north and empty |
2002 | * if the space being examined only has a wall to the north and empty |
… | |
… | |
2050 | * find_first_free_spot(archetype, maptile, x, y) works like |
2018 | * find_first_free_spot(archetype, maptile, x, y) works like |
2051 | * find_free_spot(), but it will search max number of squares. |
2019 | * find_free_spot(), but it will search max number of squares. |
2052 | * But it will return the first available spot, not a random choice. |
2020 | * But it will return the first available spot, not a random choice. |
2053 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2021 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2054 | */ |
2022 | */ |
2055 | |
|
|
2056 | int |
2023 | int |
2057 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2024 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2058 | { |
2025 | { |
2059 | int |
|
|
2060 | i; |
|
|
2061 | |
|
|
2062 | for (i = 0; i < SIZEOFFREE; i++) |
2026 | for (int i = 0; i < SIZEOFFREE; i++) |
2063 | { |
|
|
2064 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2027 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2065 | return i; |
2028 | return i; |
2066 | } |
2029 | |
2067 | return -1; |
2030 | return -1; |
2068 | } |
2031 | } |
2069 | |
2032 | |
2070 | /* |
2033 | /* |
2071 | * The function permute(arr, begin, end) randomly reorders the array |
2034 | * The function permute(arr, begin, end) randomly reorders the array |
2072 | * arr[begin..end-1]. |
2035 | * arr[begin..end-1]. |
|
|
2036 | * now uses a fisher-yates shuffle, old permute was broken |
2073 | */ |
2037 | */ |
2074 | static void |
2038 | static void |
2075 | permute (int *arr, int begin, int end) |
2039 | permute (int *arr, int begin, int end) |
2076 | { |
2040 | { |
2077 | int |
2041 | arr += begin; |
2078 | i, |
|
|
2079 | j, |
|
|
2080 | tmp, |
|
|
2081 | len; |
|
|
2082 | |
|
|
2083 | len = end - begin; |
2042 | end -= begin; |
2084 | for (i = begin; i < end; i++) |
|
|
2085 | { |
|
|
2086 | j = begin + RANDOM () % len; |
|
|
2087 | |
2043 | |
2088 | tmp = arr[i]; |
2044 | while (--end) |
2089 | arr[i] = arr[j]; |
2045 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2090 | arr[j] = tmp; |
|
|
2091 | } |
|
|
2092 | } |
2046 | } |
2093 | |
2047 | |
2094 | /* new function to make monster searching more efficient, and effective! |
2048 | /* new function to make monster searching more efficient, and effective! |
2095 | * This basically returns a randomized array (in the passed pointer) of |
2049 | * This basically returns a randomized array (in the passed pointer) of |
2096 | * the spaces to find monsters. In this way, it won't always look for |
2050 | * the spaces to find monsters. In this way, it won't always look for |
… | |
… | |
2099 | * the 3x3 area will be searched, just not in a predictable order. |
2053 | * the 3x3 area will be searched, just not in a predictable order. |
2100 | */ |
2054 | */ |
2101 | void |
2055 | void |
2102 | get_search_arr (int *search_arr) |
2056 | get_search_arr (int *search_arr) |
2103 | { |
2057 | { |
2104 | int |
2058 | int i; |
2105 | i; |
|
|
2106 | |
2059 | |
2107 | for (i = 0; i < SIZEOFFREE; i++) |
2060 | for (i = 0; i < SIZEOFFREE; i++) |
2108 | { |
|
|
2109 | search_arr[i] = i; |
2061 | search_arr[i] = i; |
2110 | } |
|
|
2111 | |
2062 | |
2112 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2063 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2113 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2064 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2114 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2065 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2115 | } |
2066 | } |
… | |
… | |
2124 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2075 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2125 | * is actually want is going to try and move there. We need this info |
2076 | * is actually want is going to try and move there. We need this info |
2126 | * because we have to know what movement the thing looking to move |
2077 | * because we have to know what movement the thing looking to move |
2127 | * there is capable of. |
2078 | * there is capable of. |
2128 | */ |
2079 | */ |
2129 | |
|
|
2130 | int |
2080 | int |
2131 | find_dir (maptile *m, int x, int y, object *exclude) |
2081 | find_dir (maptile *m, int x, int y, object *exclude) |
2132 | { |
2082 | { |
2133 | int |
|
|
2134 | i, |
|
|
2135 | max = SIZEOFFREE, mflags; |
2083 | int i, max = SIZEOFFREE, mflags; |
2136 | |
2084 | |
2137 | sint16 nx, ny; |
2085 | sint16 nx, ny; |
2138 | object * |
2086 | object *tmp; |
2139 | tmp; |
|
|
2140 | maptile * |
2087 | maptile *mp; |
2141 | mp; |
|
|
2142 | |
2088 | |
2143 | MoveType blocked, move_type; |
2089 | MoveType blocked, move_type; |
2144 | |
2090 | |
2145 | if (exclude && exclude->head) |
2091 | if (exclude && exclude->head) |
2146 | { |
2092 | { |
… | |
… | |
2163 | |
2109 | |
2164 | if (mflags & P_OUT_OF_MAP) |
2110 | if (mflags & P_OUT_OF_MAP) |
2165 | max = maxfree[i]; |
2111 | max = maxfree[i]; |
2166 | else |
2112 | else |
2167 | { |
2113 | { |
2168 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2114 | mapspace &ms = mp->at (nx, ny); |
|
|
2115 | |
|
|
2116 | blocked = ms.move_block; |
2169 | |
2117 | |
2170 | if ((move_type & blocked) == move_type) |
2118 | if ((move_type & blocked) == move_type) |
2171 | max = maxfree[i]; |
2119 | max = maxfree[i]; |
2172 | else if (mflags & P_IS_ALIVE) |
2120 | else if (mflags & P_IS_ALIVE) |
2173 | { |
2121 | { |
2174 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2122 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2175 | if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2123 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
|
|
2124 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2176 | break; |
2125 | break; |
2177 | |
2126 | |
2178 | if (tmp) |
2127 | if (tmp) |
2179 | return freedir[i]; |
2128 | return freedir[i]; |
2180 | } |
2129 | } |
… | |
… | |
2186 | |
2135 | |
2187 | /* |
2136 | /* |
2188 | * distance(object 1, object 2) will return the square of the |
2137 | * distance(object 1, object 2) will return the square of the |
2189 | * distance between the two given objects. |
2138 | * distance between the two given objects. |
2190 | */ |
2139 | */ |
2191 | |
|
|
2192 | int |
2140 | int |
2193 | distance (const object *ob1, const object *ob2) |
2141 | distance (const object *ob1, const object *ob2) |
2194 | { |
2142 | { |
2195 | int i; |
|
|
2196 | |
|
|
2197 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2143 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2198 | return i; |
|
|
2199 | } |
2144 | } |
2200 | |
2145 | |
2201 | /* |
2146 | /* |
2202 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2147 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2203 | * an object which has subtracted the x and y coordinates of another |
2148 | * an object which has subtracted the x and y coordinates of another |
2204 | * object, needs to travel toward it. |
2149 | * object, needs to travel toward it. |
2205 | */ |
2150 | */ |
2206 | |
|
|
2207 | int |
2151 | int |
2208 | find_dir_2 (int x, int y) |
2152 | find_dir_2 (int x, int y) |
2209 | { |
2153 | { |
2210 | int q; |
2154 | int q; |
2211 | |
2155 | |
… | |
… | |
2250 | int |
2194 | int |
2251 | absdir (int d) |
2195 | absdir (int d) |
2252 | { |
2196 | { |
2253 | while (d < 1) |
2197 | while (d < 1) |
2254 | d += 8; |
2198 | d += 8; |
|
|
2199 | |
2255 | while (d > 8) |
2200 | while (d > 8) |
2256 | d -= 8; |
2201 | d -= 8; |
|
|
2202 | |
2257 | return d; |
2203 | return d; |
2258 | } |
2204 | } |
2259 | |
2205 | |
2260 | /* |
2206 | /* |
2261 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2207 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2263 | */ |
2209 | */ |
2264 | |
2210 | |
2265 | int |
2211 | int |
2266 | dirdiff (int dir1, int dir2) |
2212 | dirdiff (int dir1, int dir2) |
2267 | { |
2213 | { |
2268 | int |
2214 | int d; |
2269 | d; |
|
|
2270 | |
2215 | |
2271 | d = abs (dir1 - dir2); |
2216 | d = abs (dir1 - dir2); |
2272 | if (d > 4) |
2217 | if (d > 4) |
2273 | d = 8 - d; |
2218 | d = 8 - d; |
|
|
2219 | |
2274 | return d; |
2220 | return d; |
2275 | } |
2221 | } |
2276 | |
2222 | |
2277 | /* peterm: |
2223 | /* peterm: |
2278 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2224 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
… | |
… | |
2281 | * This basically means that if direction is 15, then it could either go |
2227 | * This basically means that if direction is 15, then it could either go |
2282 | * direction 4, 14, or 16 to get back to where we are. |
2228 | * direction 4, 14, or 16 to get back to where we are. |
2283 | * Moved from spell_util.c to object.c with the other related direction |
2229 | * Moved from spell_util.c to object.c with the other related direction |
2284 | * functions. |
2230 | * functions. |
2285 | */ |
2231 | */ |
2286 | |
|
|
2287 | int |
|
|
2288 | reduction_dir[SIZEOFFREE][3] = { |
2232 | int reduction_dir[SIZEOFFREE][3] = { |
2289 | {0, 0, 0}, /* 0 */ |
2233 | {0, 0, 0}, /* 0 */ |
2290 | {0, 0, 0}, /* 1 */ |
2234 | {0, 0, 0}, /* 1 */ |
2291 | {0, 0, 0}, /* 2 */ |
2235 | {0, 0, 0}, /* 2 */ |
2292 | {0, 0, 0}, /* 3 */ |
2236 | {0, 0, 0}, /* 3 */ |
2293 | {0, 0, 0}, /* 4 */ |
2237 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2443 | /* Basically, we save the content of the string to a temp file, then call */ |
2387 | /* Basically, we save the content of the string to a temp file, then call */ |
2444 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2388 | /* load_object on it. I admit it is a highly inefficient way to make things, */ |
2445 | /* but it was simple to make and allows reusing the load_object function. */ |
2389 | /* but it was simple to make and allows reusing the load_object function. */ |
2446 | /* Remember not to use load_object_str in a time-critical situation. */ |
2390 | /* Remember not to use load_object_str in a time-critical situation. */ |
2447 | /* Also remember that multiparts objects are not supported for now. */ |
2391 | /* Also remember that multiparts objects are not supported for now. */ |
2448 | |
|
|
2449 | object * |
2392 | object * |
2450 | load_object_str (const char *obstr) |
2393 | load_object_str (const char *obstr) |
2451 | { |
2394 | { |
2452 | object *op; |
2395 | object *op; |
2453 | char filename[MAX_BUF]; |
2396 | char filename[MAX_BUF]; |
… | |
… | |
2483 | * returns NULL if no match. |
2426 | * returns NULL if no match. |
2484 | */ |
2427 | */ |
2485 | object * |
2428 | object * |
2486 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2429 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2487 | { |
2430 | { |
2488 | object *tmp; |
|
|
2489 | |
|
|
2490 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2431 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2491 | if (tmp->type == type && tmp->subtype == subtype) |
2432 | if (tmp->type == type && tmp->subtype == subtype) |
2492 | return tmp; |
2433 | return tmp; |
2493 | |
2434 | |
2494 | return NULL; |
2435 | return 0; |
2495 | } |
2436 | } |
2496 | |
2437 | |
2497 | /* If ob has a field named key, return the link from the list, |
2438 | /* If ob has a field named key, return the link from the list, |
2498 | * otherwise return NULL. |
2439 | * otherwise return NULL. |
2499 | * |
2440 | * |
… | |
… | |
2501 | * do the desired thing. |
2442 | * do the desired thing. |
2502 | */ |
2443 | */ |
2503 | key_value * |
2444 | key_value * |
2504 | get_ob_key_link (const object *ob, const char *key) |
2445 | get_ob_key_link (const object *ob, const char *key) |
2505 | { |
2446 | { |
2506 | key_value *link; |
|
|
2507 | |
|
|
2508 | for (link = ob->key_values; link != NULL; link = link->next) |
2447 | for (key_value *link = ob->key_values; link; link = link->next) |
2509 | if (link->key == key) |
2448 | if (link->key == key) |
2510 | return link; |
2449 | return link; |
2511 | |
2450 | |
2512 | return NULL; |
2451 | return 0; |
2513 | } |
2452 | } |
2514 | |
2453 | |
2515 | /* |
2454 | /* |
2516 | * Returns the value of op has an extra_field for key, or NULL. |
2455 | * Returns the value of op has an extra_field for key, or NULL. |
2517 | * |
2456 | * |
… | |
… | |
2557 | * Returns TRUE on success. |
2496 | * Returns TRUE on success. |
2558 | */ |
2497 | */ |
2559 | int |
2498 | int |
2560 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2499 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2561 | { |
2500 | { |
2562 | key_value * |
|
|
2563 | field = NULL, *last = NULL; |
2501 | key_value *field = NULL, *last = NULL; |
2564 | |
2502 | |
2565 | for (field = op->key_values; field != NULL; field = field->next) |
2503 | for (field = op->key_values; field != NULL; field = field->next) |
2566 | { |
2504 | { |
2567 | if (field->key != canonical_key) |
2505 | if (field->key != canonical_key) |
2568 | { |
2506 | { |
… | |
… | |
2596 | /* IF we get here, key doesn't exist */ |
2534 | /* IF we get here, key doesn't exist */ |
2597 | |
2535 | |
2598 | /* No field, we'll have to add it. */ |
2536 | /* No field, we'll have to add it. */ |
2599 | |
2537 | |
2600 | if (!add_key) |
2538 | if (!add_key) |
2601 | { |
|
|
2602 | return FALSE; |
2539 | return FALSE; |
2603 | } |
2540 | |
2604 | /* There isn't any good reason to store a null |
2541 | /* There isn't any good reason to store a null |
2605 | * value in the key/value list. If the archetype has |
2542 | * value in the key/value list. If the archetype has |
2606 | * this key, then we should also have it, so shouldn't |
2543 | * this key, then we should also have it, so shouldn't |
2607 | * be here. If user wants to store empty strings, |
2544 | * be here. If user wants to store empty strings, |
2608 | * should pass in "" |
2545 | * should pass in "" |