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