… | |
… | |
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); |
… | |
… | |
190 | * Check nrof variable *before* calling can_merge() |
190 | * Check nrof variable *before* calling can_merge() |
191 | * |
191 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
192 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
193 | * check weight |
194 | */ |
194 | */ |
195 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
195 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
196 | { |
198 | /* A couple quicksanity checks */ |
197 | /* A couple quicksanity checks */ |
199 | if (ob1 == ob2 |
198 | if (ob1 == ob2 |
200 | || ob1->type != ob2->type |
199 | || ob1->type != ob2->type |
… | |
… | |
277 | |
276 | |
278 | /* Note sure why the following is the case - either the object has to |
277 | /* Note sure why the following is the case - either the object has to |
279 | * be animated or have a very low speed. Is this an attempted monster |
278 | * be animated or have a very low speed. Is this an attempted monster |
280 | * check? |
279 | * check? |
281 | */ |
280 | */ |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
281 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
283 | return 0; |
282 | return 0; |
284 | |
283 | |
285 | switch (ob1->type) |
284 | switch (ob1->type) |
286 | { |
285 | { |
287 | case SCROLL: |
286 | case SCROLL: |
… | |
… | |
364 | { |
363 | { |
365 | if (!op) |
364 | if (!op) |
366 | return strdup ("[NULLOBJ]"); |
365 | return strdup ("[NULLOBJ]"); |
367 | |
366 | |
368 | object_freezer freezer; |
367 | object_freezer freezer; |
369 | save_object (freezer, op, 3); |
368 | save_object (freezer, op, 1); |
370 | return freezer.as_string (); |
369 | return freezer.as_string (); |
371 | } |
370 | } |
372 | |
371 | |
373 | /* |
372 | /* |
374 | * get_nearest_part(multi-object, object 2) returns the part of the |
373 | * get_nearest_part(multi-object, object 2) returns the part of the |
… | |
… | |
482 | { |
481 | { |
483 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
482 | bool is_freed = QUERY_FLAG (dst, FLAG_FREED); |
484 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
483 | bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); |
485 | |
484 | |
486 | *(object_copy *)dst = *this; |
485 | *(object_copy *)dst = *this; |
487 | |
|
|
488 | if (self || cb) |
|
|
489 | INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); |
|
|
490 | |
486 | |
491 | if (is_freed) |
487 | if (is_freed) |
492 | SET_FLAG (dst, FLAG_FREED); |
488 | SET_FLAG (dst, FLAG_FREED); |
493 | |
489 | |
494 | if (is_removed) |
490 | if (is_removed) |
… | |
… | |
525 | tail = new_link; |
521 | tail = new_link; |
526 | } |
522 | } |
527 | } |
523 | } |
528 | } |
524 | } |
529 | |
525 | |
530 | update_ob_speed (dst); |
526 | dst->set_speed (dst->speed); |
531 | } |
527 | } |
532 | |
528 | |
533 | object * |
529 | object * |
534 | object::clone () |
530 | object::clone () |
535 | { |
531 | { |
… | |
… | |
541 | /* |
537 | /* |
542 | * If an object with the IS_TURNABLE() flag needs to be turned due |
538 | * If an object with the IS_TURNABLE() flag needs to be turned due |
543 | * to the closest player being on the other side, this function can |
539 | * to the closest player being on the other side, this function can |
544 | * be called to update the face variable, _and_ how it looks on the map. |
540 | * be called to update the face variable, _and_ how it looks on the map. |
545 | */ |
541 | */ |
546 | |
|
|
547 | void |
542 | void |
548 | update_turn_face (object *op) |
543 | update_turn_face (object *op) |
549 | { |
544 | { |
550 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
545 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
551 | return; |
546 | return; |
|
|
547 | |
552 | SET_ANIMATION (op, op->direction); |
548 | SET_ANIMATION (op, op->direction); |
553 | update_object (op, UP_OBJ_FACE); |
549 | update_object (op, UP_OBJ_FACE); |
554 | } |
550 | } |
555 | |
551 | |
556 | /* |
552 | /* |
557 | * Updates the speed of an object. If the speed changes from 0 to another |
553 | * 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. |
554 | * 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. |
555 | * This function needs to be called whenever the speed of an object changes. |
560 | */ |
556 | */ |
561 | void |
557 | void |
562 | update_ob_speed (object *op) |
558 | object::set_speed (float speed) |
563 | { |
559 | { |
564 | extern int arch_init; |
560 | if (flag [FLAG_FREED] && speed) |
565 | |
|
|
566 | /* No reason putting the archetypes objects on the speed list, |
|
|
567 | * since they never really need to be updated. |
|
|
568 | */ |
|
|
569 | |
|
|
570 | if (QUERY_FLAG (op, FLAG_FREED) && op->speed) |
|
|
571 | { |
561 | { |
572 | LOG (llevError, "Object %s is freed but has speed.\n", &op->name); |
562 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
573 | #ifdef MANY_CORES |
|
|
574 | abort (); |
|
|
575 | #else |
|
|
576 | op->speed = 0; |
563 | speed = 0; |
577 | #endif |
|
|
578 | } |
|
|
579 | |
|
|
580 | if (arch_init) |
|
|
581 | return; |
|
|
582 | |
|
|
583 | if (FABS (op->speed) > MIN_ACTIVE_SPEED) |
|
|
584 | { |
564 | } |
585 | /* If already on active list, don't do anything */ |
|
|
586 | if (op->active_next || op->active_prev || op == active_objects) |
|
|
587 | return; |
|
|
588 | |
565 | |
589 | /* process_events() expects us to insert the object at the beginning |
566 | this->speed = speed; |
590 | * of the list. */ |
|
|
591 | op->active_next = active_objects; |
|
|
592 | |
567 | |
593 | if (op->active_next != NULL) |
568 | if (has_active_speed ()) |
594 | op->active_next->active_prev = op; |
569 | activate (); |
595 | |
|
|
596 | active_objects = op; |
|
|
597 | } |
|
|
598 | else |
570 | else |
599 | { |
571 | deactivate (); |
600 | /* If not on the active list, nothing needs to be done */ |
|
|
601 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
602 | return; |
|
|
603 | |
|
|
604 | if (op->active_prev == NULL) |
|
|
605 | { |
|
|
606 | active_objects = op->active_next; |
|
|
607 | |
|
|
608 | if (op->active_next != NULL) |
|
|
609 | op->active_next->active_prev = NULL; |
|
|
610 | } |
|
|
611 | else |
|
|
612 | { |
|
|
613 | op->active_prev->active_next = op->active_next; |
|
|
614 | |
|
|
615 | if (op->active_next) |
|
|
616 | op->active_next->active_prev = op->active_prev; |
|
|
617 | } |
|
|
618 | |
|
|
619 | op->active_next = NULL; |
|
|
620 | op->active_prev = NULL; |
|
|
621 | } |
|
|
622 | } |
|
|
623 | |
|
|
624 | /* This function removes object 'op' from the list of active |
|
|
625 | * objects. |
|
|
626 | * This should only be used for style maps or other such |
|
|
627 | * reference maps where you don't want an object that isn't |
|
|
628 | * in play chewing up cpu time getting processed. |
|
|
629 | * The reverse of this is to call update_ob_speed, which |
|
|
630 | * will do the right thing based on the speed of the object. |
|
|
631 | */ |
|
|
632 | void |
|
|
633 | remove_from_active_list (object *op) |
|
|
634 | { |
|
|
635 | /* If not on the active list, nothing needs to be done */ |
|
|
636 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
637 | return; |
|
|
638 | |
|
|
639 | if (op->active_prev == NULL) |
|
|
640 | { |
|
|
641 | active_objects = op->active_next; |
|
|
642 | if (op->active_next != NULL) |
|
|
643 | op->active_next->active_prev = NULL; |
|
|
644 | } |
|
|
645 | else |
|
|
646 | { |
|
|
647 | op->active_prev->active_next = op->active_next; |
|
|
648 | if (op->active_next) |
|
|
649 | op->active_next->active_prev = op->active_prev; |
|
|
650 | } |
|
|
651 | op->active_next = NULL; |
|
|
652 | op->active_prev = NULL; |
|
|
653 | } |
572 | } |
654 | |
573 | |
655 | /* |
574 | /* |
656 | * update_object() updates the the map. |
575 | * update_object() updates the the map. |
657 | * It takes into account invisible objects (and represent squares covered |
576 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
694 | */ |
613 | */ |
695 | if (!op->map || op->map->in_memory == MAP_SAVING) |
614 | if (!op->map || op->map->in_memory == MAP_SAVING) |
696 | return; |
615 | return; |
697 | |
616 | |
698 | /* make sure the object is within map boundaries */ |
617 | /* 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)) |
618 | if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) |
700 | { |
619 | { |
701 | LOG (llevError, "update_object() called for object out of map!\n"); |
620 | LOG (llevError, "update_object() called for object out of map!\n"); |
702 | #ifdef MANY_CORES |
621 | #ifdef MANY_CORES |
703 | abort (); |
622 | abort (); |
704 | #endif |
623 | #endif |
705 | return; |
624 | return; |
706 | } |
625 | } |
707 | |
626 | |
708 | mapspace &m = op->ms (); |
627 | mapspace &m = op->ms (); |
709 | |
628 | |
710 | if (m.flags_ & P_NEED_UPDATE) |
629 | if (!(m.flags_ & P_UPTODATE)) |
711 | /* nop */; |
630 | /* nop */; |
712 | else if (action == UP_OBJ_INSERT) |
631 | else if (action == UP_OBJ_INSERT) |
713 | { |
632 | { |
714 | // this is likely overkill, TODO: revisit (schmorp) |
633 | // this is likely overkill, TODO: revisit (schmorp) |
715 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
634 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
724 | /* This isn't perfect, but I don't expect a lot of objects to |
643 | /* This isn't perfect, but I don't expect a lot of objects to |
725 | * to have move_allow right now. |
644 | * to have move_allow right now. |
726 | */ |
645 | */ |
727 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
646 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
728 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
647 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
729 | m.flags_ = P_NEED_UPDATE; |
648 | m.flags_ = 0; |
730 | } |
649 | } |
731 | /* if the object is being removed, we can't make intelligent |
650 | /* if the object is being removed, we can't make intelligent |
732 | * decisions, because remove_ob can't really pass the object |
651 | * decisions, because remove_ob can't really pass the object |
733 | * that is being removed. |
652 | * that is being removed. |
734 | */ |
653 | */ |
735 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
654 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
736 | m.flags_ = P_NEED_UPDATE; |
655 | m.flags_ = 0; |
737 | else if (action == UP_OBJ_FACE) |
656 | else if (action == UP_OBJ_FACE) |
738 | /* Nothing to do for that case */ ; |
657 | /* Nothing to do for that case */ ; |
739 | else |
658 | else |
740 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
659 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
741 | |
660 | |
742 | if (op->more) |
661 | if (op->more) |
743 | update_object (op->more, action); |
662 | update_object (op->more, action); |
744 | } |
663 | } |
745 | |
664 | |
746 | object::vector object::mortals; |
|
|
747 | object::vector object::objects; // not yet used |
|
|
748 | object *object::first; |
665 | 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 | |
666 | |
762 | object::object () |
667 | object::object () |
763 | { |
668 | { |
764 | SET_FLAG (this, FLAG_REMOVED); |
669 | SET_FLAG (this, FLAG_REMOVED); |
765 | |
670 | |
… | |
… | |
797 | |
702 | |
798 | prev = 0; |
703 | prev = 0; |
799 | next = 0; |
704 | next = 0; |
800 | } |
705 | } |
801 | |
706 | |
|
|
707 | bool |
|
|
708 | object::active () const |
|
|
709 | { |
|
|
710 | return active_next || active_prev || this == active_objects; |
|
|
711 | } |
|
|
712 | |
|
|
713 | void |
|
|
714 | object::activate () |
|
|
715 | { |
|
|
716 | /* If already on active list, don't do anything */ |
|
|
717 | if (active ()) |
|
|
718 | return; |
|
|
719 | |
|
|
720 | if (has_active_speed ()) |
|
|
721 | { |
|
|
722 | /* process_events() expects us to insert the object at the beginning |
|
|
723 | * of the list. */ |
|
|
724 | active_next = active_objects; |
|
|
725 | |
|
|
726 | if (active_next) |
|
|
727 | active_next->active_prev = this; |
|
|
728 | |
|
|
729 | active_objects = this; |
|
|
730 | } |
|
|
731 | } |
|
|
732 | |
|
|
733 | void |
|
|
734 | object::activate_recursive () |
|
|
735 | { |
|
|
736 | activate (); |
|
|
737 | |
|
|
738 | for (object *op = inv; op; op = op->above) |
|
|
739 | op->activate_recursive (); |
|
|
740 | } |
|
|
741 | |
|
|
742 | /* This function removes object 'op' from the list of active |
|
|
743 | * objects. |
|
|
744 | * This should only be used for style maps or other such |
|
|
745 | * reference maps where you don't want an object that isn't |
|
|
746 | * in play chewing up cpu time getting processed. |
|
|
747 | * The reverse of this is to call update_ob_speed, which |
|
|
748 | * will do the right thing based on the speed of the object. |
|
|
749 | */ |
|
|
750 | void |
|
|
751 | object::deactivate () |
|
|
752 | { |
|
|
753 | /* If not on the active list, nothing needs to be done */ |
|
|
754 | if (!active ()) |
|
|
755 | return; |
|
|
756 | |
|
|
757 | if (active_prev == 0) |
|
|
758 | { |
|
|
759 | active_objects = active_next; |
|
|
760 | if (active_next) |
|
|
761 | active_next->active_prev = 0; |
|
|
762 | } |
|
|
763 | else |
|
|
764 | { |
|
|
765 | active_prev->active_next = active_next; |
|
|
766 | if (active_next) |
|
|
767 | active_next->active_prev = active_prev; |
|
|
768 | } |
|
|
769 | |
|
|
770 | active_next = 0; |
|
|
771 | active_prev = 0; |
|
|
772 | } |
|
|
773 | |
|
|
774 | void |
|
|
775 | object::deactivate_recursive () |
|
|
776 | { |
|
|
777 | for (object *op = inv; op; op = op->above) |
|
|
778 | op->deactivate_recursive (); |
|
|
779 | |
|
|
780 | deactivate (); |
|
|
781 | } |
|
|
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 | // need to check first, because the checks below might segfault |
|
|
791 | // as we might be on an invalid mapspace and crossfire code |
|
|
792 | // is too buggy to ensure that the inventory is empty. |
|
|
793 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
794 | // cf will crash below with off-map x and y |
|
|
795 | if (!inv) |
|
|
796 | return; |
|
|
797 | |
|
|
798 | /* Only if the space blocks everything do we not process - |
|
|
799 | * if some form of movement is allowed, let objects |
|
|
800 | * drop on that space. |
|
|
801 | */ |
|
|
802 | if (!drop_to_ground |
|
|
803 | || !map |
|
|
804 | || map->in_memory != MAP_IN_MEMORY |
|
|
805 | || ms ().move_block == MOVE_ALL) |
|
|
806 | { |
|
|
807 | while (inv) |
|
|
808 | { |
|
|
809 | inv->destroy_inv (drop_to_ground); |
|
|
810 | inv->destroy (); |
|
|
811 | } |
|
|
812 | } |
|
|
813 | else |
|
|
814 | { /* Put objects in inventory onto this space */ |
|
|
815 | while (inv) |
|
|
816 | { |
|
|
817 | object *op = inv; |
|
|
818 | |
|
|
819 | if (op->flag [FLAG_STARTEQUIP] |
|
|
820 | || op->flag [FLAG_NO_DROP] |
|
|
821 | || op->type == RUNE |
|
|
822 | || op->type == TRAP |
|
|
823 | || op->flag [FLAG_IS_A_TEMPLATE]) |
|
|
824 | op->destroy (); |
|
|
825 | else |
|
|
826 | map->insert (op, x, y); |
|
|
827 | } |
|
|
828 | } |
|
|
829 | } |
|
|
830 | |
802 | object *object::create () |
831 | object *object::create () |
803 | { |
832 | { |
804 | object *op = new object; |
833 | object *op = new object; |
805 | op->link (); |
834 | op->link (); |
806 | return op; |
835 | return op; |
807 | } |
836 | } |
808 | |
837 | |
809 | /* |
838 | void |
810 | * free_object() frees everything allocated by an object, removes |
839 | 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 | { |
840 | { |
821 | if (QUERY_FLAG (this, FLAG_FREED)) |
841 | if (flag [FLAG_IS_LINKED]) |
|
|
842 | remove_button_link (this); |
|
|
843 | |
|
|
844 | if (flag [FLAG_FRIENDLY]) |
|
|
845 | remove_friendly_object (this); |
|
|
846 | |
|
|
847 | if (!flag [FLAG_REMOVED]) |
|
|
848 | remove (); |
|
|
849 | |
|
|
850 | if (flag [FLAG_FREED]) |
822 | return; |
851 | return; |
823 | |
852 | |
824 | if (QUERY_FLAG (this, FLAG_FRIENDLY)) |
853 | set_speed (0); |
825 | remove_friendly_object (this); |
|
|
826 | |
854 | |
827 | if (!QUERY_FLAG (this, FLAG_REMOVED)) |
855 | flag [FLAG_FREED] = 1; |
828 | remove (); |
|
|
829 | |
856 | |
830 | SET_FLAG (this, FLAG_FREED); |
857 | attachable::do_destroy (); |
831 | |
858 | |
832 | if (more) |
859 | destroy_inv (true); |
833 | { |
860 | unlink (); |
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 | |
861 | |
880 | // hack to ensure that freed objects still have a valid map |
862 | // hack to ensure that freed objects still have a valid map |
881 | { |
863 | { |
882 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
864 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
883 | |
865 | |
… | |
… | |
887 | |
869 | |
888 | freed_map->name = "/internal/freed_objects_map"; |
870 | freed_map->name = "/internal/freed_objects_map"; |
889 | freed_map->width = 3; |
871 | freed_map->width = 3; |
890 | freed_map->height = 3; |
872 | freed_map->height = 3; |
891 | |
873 | |
892 | freed_map->allocate (); |
874 | freed_map->alloc (); |
893 | } |
875 | } |
894 | |
876 | |
895 | map = freed_map; |
877 | map = freed_map; |
896 | x = 1; |
878 | x = 1; |
897 | y = 1; |
879 | y = 1; |
898 | } |
880 | } |
899 | |
881 | |
|
|
882 | head = 0; |
|
|
883 | |
|
|
884 | if (more) |
|
|
885 | { |
|
|
886 | more->destroy (); |
|
|
887 | more = 0; |
|
|
888 | } |
|
|
889 | |
900 | // clear those pointers that likely might have circular references to us |
890 | // clear those pointers that likely might have circular references to us |
901 | owner = 0; |
891 | owner = 0; |
902 | enemy = 0; |
892 | enemy = 0; |
903 | attacked_by = 0; |
893 | attacked_by = 0; |
904 | |
894 | |
905 | // only relevant for players(?), but make sure of it anyways |
895 | // only relevant for players(?), but make sure of it anyways |
906 | contr = 0; |
896 | contr = 0; |
|
|
897 | } |
907 | |
898 | |
908 | /* Remove object from the active list */ |
899 | void |
909 | speed = 0; |
900 | object::destroy (bool destroy_inventory) |
910 | update_ob_speed (this); |
901 | { |
|
|
902 | if (destroyed ()) |
|
|
903 | return; |
911 | |
904 | |
912 | unlink (); |
905 | if (destroy_inventory) |
|
|
906 | destroy_inv (false); |
913 | |
907 | |
914 | mortals.push_back (this); |
908 | attachable::destroy (); |
915 | } |
909 | } |
916 | |
910 | |
917 | /* |
911 | /* |
918 | * sub_weight() recursively (outwards) subtracts a number from the |
912 | * sub_weight() recursively (outwards) subtracts a number from the |
919 | * weight of an object (and what is carried by it's environment(s)). |
913 | * weight of an object (and what is carried by it's environment(s)). |
… | |
… | |
943 | object::remove () |
937 | object::remove () |
944 | { |
938 | { |
945 | object *tmp, *last = 0; |
939 | object *tmp, *last = 0; |
946 | object *otmp; |
940 | object *otmp; |
947 | |
941 | |
948 | int check_walk_off; |
|
|
949 | |
|
|
950 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
942 | if (QUERY_FLAG (this, FLAG_REMOVED)) |
951 | return; |
943 | return; |
952 | |
944 | |
953 | SET_FLAG (this, FLAG_REMOVED); |
945 | SET_FLAG (this, FLAG_REMOVED); |
|
|
946 | INVOKE_OBJECT (REMOVE, this); |
954 | |
947 | |
955 | if (more) |
948 | if (more) |
956 | more->remove (); |
949 | more->remove (); |
957 | |
950 | |
958 | /* |
951 | /* |
… | |
… | |
971 | * to save cpu time. |
964 | * to save cpu time. |
972 | */ |
965 | */ |
973 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
966 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
974 | otmp->update_stats (); |
967 | otmp->update_stats (); |
975 | |
968 | |
976 | if (above != NULL) |
969 | if (above) |
977 | above->below = below; |
970 | above->below = below; |
978 | else |
971 | else |
979 | env->inv = below; |
972 | env->inv = below; |
980 | |
973 | |
981 | if (below != NULL) |
974 | if (below) |
982 | below->above = above; |
975 | below->above = above; |
983 | |
976 | |
984 | /* we set up values so that it could be inserted into |
977 | /* we set up values so that it could be inserted into |
985 | * the map, but we don't actually do that - it is up |
978 | * the map, but we don't actually do that - it is up |
986 | * to the caller to decide what we want to do. |
979 | * to the caller to decide what we want to do. |
… | |
… | |
990 | above = 0, below = 0; |
983 | above = 0, below = 0; |
991 | env = 0; |
984 | env = 0; |
992 | } |
985 | } |
993 | else if (map) |
986 | else if (map) |
994 | { |
987 | { |
995 | /* Re did the following section of code - it looks like it had |
988 | if (type == PLAYER) |
996 | * lots of logic for things we no longer care about |
|
|
997 | */ |
989 | { |
|
|
990 | --map->players; |
|
|
991 | map->touch (); |
|
|
992 | } |
|
|
993 | |
|
|
994 | map->dirty = true; |
998 | |
995 | |
999 | /* link the object above us */ |
996 | /* link the object above us */ |
1000 | if (above) |
997 | if (above) |
1001 | above->below = below; |
998 | above->below = below; |
1002 | else |
999 | else |
… | |
… | |
1020 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1017 | dump = dump_object (GET_MAP_OB (map, x, y)); |
1021 | LOG (llevError, "%s\n", dump); |
1018 | LOG (llevError, "%s\n", dump); |
1022 | free (dump); |
1019 | free (dump); |
1023 | } |
1020 | } |
1024 | |
1021 | |
1025 | map->at (x, y).bottom = above; /* goes on above it. */ |
1022 | map->at (x, y).bot = above; /* goes on above it. */ |
1026 | } |
1023 | } |
1027 | |
1024 | |
1028 | above = 0; |
1025 | above = 0; |
1029 | below = 0; |
1026 | below = 0; |
1030 | |
1027 | |
1031 | if (map->in_memory == MAP_SAVING) |
1028 | if (map->in_memory == MAP_SAVING) |
1032 | return; |
1029 | return; |
1033 | |
1030 | |
1034 | check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); |
1031 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1035 | |
1032 | |
1036 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
1033 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1037 | { |
1034 | { |
1038 | /* No point updating the players look faces if he is the object |
1035 | /* No point updating the players look faces if he is the object |
1039 | * being removed. |
1036 | * being removed. |
1040 | */ |
1037 | */ |
1041 | |
1038 | |
… | |
… | |
1045 | * removed (most likely destroyed), update the player view |
1042 | * removed (most likely destroyed), update the player view |
1046 | * appropriately. |
1043 | * appropriately. |
1047 | */ |
1044 | */ |
1048 | if (tmp->container == this) |
1045 | if (tmp->container == this) |
1049 | { |
1046 | { |
1050 | CLEAR_FLAG (this, FLAG_APPLIED); |
1047 | flag [FLAG_APPLIED] = 0; |
1051 | tmp->container = 0; |
1048 | tmp->container = 0; |
1052 | } |
1049 | } |
1053 | |
1050 | |
|
|
1051 | if (tmp->contr->ns) |
1054 | tmp->contr->ns->floorbox_update (); |
1052 | tmp->contr->ns->floorbox_update (); |
1055 | } |
1053 | } |
1056 | |
1054 | |
1057 | /* See if player moving off should effect something */ |
1055 | /* See if object moving off should effect something */ |
1058 | if (check_walk_off |
1056 | if (check_walk_off |
1059 | && ((move_type & tmp->move_off) |
1057 | && ((move_type & tmp->move_off) |
1060 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1058 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1061 | { |
1059 | { |
1062 | move_apply (tmp, this, 0); |
1060 | move_apply (tmp, this, 0); |
… | |
… | |
1064 | if (destroyed ()) |
1062 | if (destroyed ()) |
1065 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1063 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1066 | } |
1064 | } |
1067 | |
1065 | |
1068 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1066 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1069 | |
1067 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1070 | if (tmp->above == tmp) |
1068 | if (tmp->above == tmp) |
1071 | tmp->above = 0; |
1069 | tmp->above = 0; |
1072 | |
1070 | |
1073 | last = tmp; |
1071 | last = tmp; |
1074 | } |
1072 | } |
1075 | |
1073 | |
1076 | /* last == NULL of there are no objects on this space */ |
1074 | /* last == NULL if there are no objects on this space */ |
|
|
1075 | //TODO: this makes little sense, why only update the topmost object? |
1077 | if (!last) |
1076 | if (!last) |
1078 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1077 | map->at (x, y).flags_ = 0; |
1079 | else |
1078 | else |
1080 | update_object (last, UP_OBJ_REMOVE); |
1079 | update_object (last, UP_OBJ_REMOVE); |
1081 | |
1080 | |
1082 | if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) |
1081 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1083 | update_all_los (map, x, y); |
1082 | update_all_los (map, x, y); |
1084 | } |
1083 | } |
1085 | } |
1084 | } |
1086 | |
1085 | |
1087 | /* |
1086 | /* |
… | |
… | |
1096 | merge_ob (object *op, object *top) |
1095 | merge_ob (object *op, object *top) |
1097 | { |
1096 | { |
1098 | if (!op->nrof) |
1097 | if (!op->nrof) |
1099 | return 0; |
1098 | return 0; |
1100 | |
1099 | |
1101 | if (top == NULL) |
1100 | if (top) |
1102 | for (top = op; top != NULL && top->above != NULL; top = top->above); |
1101 | for (top = op; top && top->above; top = top->above) |
|
|
1102 | ; |
1103 | |
1103 | |
1104 | for (; top != NULL; top = top->below) |
1104 | for (; top; top = top->below) |
1105 | { |
1105 | { |
1106 | if (top == op) |
1106 | if (top == op) |
1107 | continue; |
1107 | continue; |
1108 | |
1108 | |
1109 | if (object::can_merge (op, top)) |
1109 | if (object::can_merge (op, top)) |
… | |
… | |
1125 | * job preparing multi-part monsters |
1125 | * job preparing multi-part monsters |
1126 | */ |
1126 | */ |
1127 | object * |
1127 | object * |
1128 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1128 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1129 | { |
1129 | { |
1130 | object *tmp; |
|
|
1131 | |
|
|
1132 | if (op->head) |
|
|
1133 | op = op->head; |
|
|
1134 | |
|
|
1135 | for (tmp = op; tmp; tmp = tmp->more) |
1130 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1136 | { |
1131 | { |
1137 | tmp->x = x + tmp->arch->clone.x; |
1132 | tmp->x = x + tmp->arch->clone.x; |
1138 | tmp->y = y + tmp->arch->clone.y; |
1133 | tmp->y = y + tmp->arch->clone.y; |
1139 | } |
1134 | } |
1140 | |
1135 | |
… | |
… | |
1159 | * Return value: |
1154 | * Return value: |
1160 | * new object if 'op' was merged with other object |
1155 | * new object if 'op' was merged with other object |
1161 | * NULL if 'op' was destroyed |
1156 | * NULL if 'op' was destroyed |
1162 | * just 'op' otherwise |
1157 | * just 'op' otherwise |
1163 | */ |
1158 | */ |
1164 | |
|
|
1165 | object * |
1159 | object * |
1166 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1160 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1167 | { |
1161 | { |
1168 | object *tmp, *top, *floor = NULL; |
1162 | object *tmp, *top, *floor = NULL; |
1169 | sint16 x, y; |
1163 | sint16 x, y; |
… | |
… | |
1172 | { |
1166 | { |
1173 | LOG (llevError, "Trying to insert freed object!\n"); |
1167 | LOG (llevError, "Trying to insert freed object!\n"); |
1174 | return NULL; |
1168 | return NULL; |
1175 | } |
1169 | } |
1176 | |
1170 | |
1177 | if (m == NULL) |
1171 | if (!m) |
1178 | { |
1172 | { |
1179 | char *dump = dump_object (op); |
1173 | char *dump = dump_object (op); |
1180 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1174 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1181 | free (dump); |
1175 | free (dump); |
1182 | return op; |
1176 | return op; |
… | |
… | |
1203 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1197 | LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); |
1204 | free (dump); |
1198 | free (dump); |
1205 | return op; |
1199 | return op; |
1206 | } |
1200 | } |
1207 | |
1201 | |
1208 | if (op->more != NULL) |
1202 | if (op->more) |
1209 | { |
1203 | { |
1210 | /* The part may be on a different map. */ |
1204 | /* The part may be on a different map. */ |
1211 | |
1205 | |
1212 | object *more = op->more; |
1206 | object *more = op->more; |
1213 | |
1207 | |
… | |
… | |
1229 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1223 | if (insert_ob_in_map (more, more->map, originator, flag) == NULL) |
1230 | { |
1224 | { |
1231 | if (!op->head) |
1225 | if (!op->head) |
1232 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1226 | LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); |
1233 | |
1227 | |
1234 | return NULL; |
1228 | return 0; |
1235 | } |
1229 | } |
1236 | } |
1230 | } |
1237 | |
1231 | |
1238 | CLEAR_FLAG (op, FLAG_REMOVED); |
1232 | CLEAR_FLAG (op, FLAG_REMOVED); |
1239 | |
1233 | |
… | |
… | |
1246 | y = op->y; |
1240 | y = op->y; |
1247 | |
1241 | |
1248 | /* this has to be done after we translate the coordinates. |
1242 | /* this has to be done after we translate the coordinates. |
1249 | */ |
1243 | */ |
1250 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1244 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1251 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1245 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1252 | if (object::can_merge (op, tmp)) |
1246 | if (object::can_merge (op, tmp)) |
1253 | { |
1247 | { |
1254 | op->nrof += tmp->nrof; |
1248 | op->nrof += tmp->nrof; |
1255 | tmp->destroy (); |
1249 | tmp->destroy (); |
1256 | } |
1250 | } |
… | |
… | |
1273 | op->below = originator->below; |
1267 | op->below = originator->below; |
1274 | |
1268 | |
1275 | if (op->below) |
1269 | if (op->below) |
1276 | op->below->above = op; |
1270 | op->below->above = op; |
1277 | else |
1271 | else |
1278 | op->ms ().bottom = op; |
1272 | op->ms ().bot = op; |
1279 | |
1273 | |
1280 | /* since *below* originator, no need to update top */ |
1274 | /* since *below* originator, no need to update top */ |
1281 | originator->below = op; |
1275 | originator->below = op; |
1282 | } |
1276 | } |
1283 | else |
1277 | else |
1284 | { |
1278 | { |
1285 | /* If there are other objects, then */ |
1279 | /* If there are other objects, then */ |
1286 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1280 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1287 | { |
1281 | { |
1288 | object *last = NULL; |
1282 | object *last = 0; |
1289 | |
1283 | |
1290 | /* |
1284 | /* |
1291 | * If there are multiple objects on this space, we do some trickier handling. |
1285 | * If there are multiple objects on this space, we do some trickier handling. |
1292 | * We've already dealt with merging if appropriate. |
1286 | * We've already dealt with merging if appropriate. |
1293 | * Generally, we want to put the new object on top. But if |
1287 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1297 | * once we get to them. This reduces the need to traverse over all of |
1291 | * once we get to them. This reduces the need to traverse over all of |
1298 | * them when adding another one - this saves quite a bit of cpu time |
1292 | * them when adding another one - this saves quite a bit of cpu time |
1299 | * when lots of spells are cast in one area. Currently, it is presumed |
1293 | * when lots of spells are cast in one area. Currently, it is presumed |
1300 | * that flying non pickable objects are spell objects. |
1294 | * that flying non pickable objects are spell objects. |
1301 | */ |
1295 | */ |
1302 | |
|
|
1303 | while (top != NULL) |
1296 | while (top) |
1304 | { |
1297 | { |
1305 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1298 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1306 | floor = top; |
1299 | floor = top; |
1307 | |
1300 | |
1308 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1301 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1361 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1354 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1362 | |
1355 | |
1363 | if (op->above) |
1356 | if (op->above) |
1364 | op->above->below = op; |
1357 | op->above->below = op; |
1365 | |
1358 | |
1366 | op->below = NULL; |
1359 | op->below = 0; |
1367 | op->ms ().bottom = op; |
1360 | op->ms ().bot = op; |
1368 | } |
1361 | } |
1369 | else |
1362 | else |
1370 | { /* get inserted into the stack above top */ |
1363 | { /* get inserted into the stack above top */ |
1371 | op->above = top->above; |
1364 | op->above = top->above; |
1372 | |
1365 | |
… | |
… | |
1375 | |
1368 | |
1376 | op->below = top; |
1369 | op->below = top; |
1377 | top->above = op; |
1370 | top->above = op; |
1378 | } |
1371 | } |
1379 | |
1372 | |
1380 | if (op->above == NULL) |
1373 | if (!op->above) |
1381 | op->ms ().top = op; |
1374 | op->ms ().top = op; |
1382 | } /* else not INS_BELOW_ORIGINATOR */ |
1375 | } /* else not INS_BELOW_ORIGINATOR */ |
1383 | |
1376 | |
1384 | if (op->type == PLAYER) |
1377 | if (op->type == PLAYER) |
|
|
1378 | { |
1385 | op->contr->do_los = 1; |
1379 | op->contr->do_los = 1; |
|
|
1380 | ++op->map->players; |
|
|
1381 | op->map->touch (); |
|
|
1382 | } |
|
|
1383 | |
|
|
1384 | op->map->dirty = true; |
1386 | |
1385 | |
1387 | /* If we have a floor, we know the player, if any, will be above |
1386 | /* If we have a floor, we know the player, if any, will be above |
1388 | * it, so save a few ticks and start from there. |
1387 | * it, so save a few ticks and start from there. |
1389 | */ |
1388 | */ |
1390 | if (!(flag & INS_MAP_LOAD)) |
1389 | if (!(flag & INS_MAP_LOAD)) |
1391 | if (object *pl = op->ms ().player ()) |
1390 | if (object *pl = op->ms ().player ()) |
|
|
1391 | if (pl->contr->ns) |
1392 | pl->contr->ns->floorbox_update (); |
1392 | pl->contr->ns->floorbox_update (); |
1393 | |
1393 | |
1394 | /* If this object glows, it may affect lighting conditions that are |
1394 | /* If this object glows, it may affect lighting conditions that are |
1395 | * visible to others on this map. But update_all_los is really |
1395 | * visible to others on this map. But update_all_los is really |
1396 | * an inefficient way to do this, as it means los for all players |
1396 | * an inefficient way to do this, as it means los for all players |
1397 | * on the map will get recalculated. The players could very well |
1397 | * on the map will get recalculated. The players could very well |
1398 | * be far away from this change and not affected in any way - |
1398 | * be far away from this change and not affected in any way - |
1399 | * this should get redone to only look for players within range, |
1399 | * this should get redone to only look for players within range, |
1400 | * or just updating the P_NEED_UPDATE for spaces within this area |
1400 | * or just updating the P_UPTODATE for spaces within this area |
1401 | * of effect may be sufficient. |
1401 | * of effect may be sufficient. |
1402 | */ |
1402 | */ |
1403 | if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) |
1403 | if (op->map->darkness && (op->glow_radius != 0)) |
1404 | update_all_los (op->map, op->x, op->y); |
1404 | update_all_los (op->map, op->x, op->y); |
1405 | |
1405 | |
1406 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1406 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1407 | update_object (op, UP_OBJ_INSERT); |
1407 | update_object (op, UP_OBJ_INSERT); |
|
|
1408 | |
|
|
1409 | INVOKE_OBJECT (INSERT, op); |
1408 | |
1410 | |
1409 | /* Don't know if moving this to the end will break anything. However, |
1411 | /* Don't know if moving this to the end will break anything. However, |
1410 | * we want to have floorbox_update called before calling this. |
1412 | * we want to have floorbox_update called before calling this. |
1411 | * |
1413 | * |
1412 | * check_move_on() must be after this because code called from |
1414 | * check_move_on() must be after this because code called from |
… | |
… | |
1417 | |
1419 | |
1418 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1420 | /* 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) |
1421 | if (!(flag & INS_NO_WALK_ON) && !op->head) |
1420 | { |
1422 | { |
1421 | if (check_move_on (op, originator)) |
1423 | if (check_move_on (op, originator)) |
1422 | return NULL; |
1424 | return 0; |
1423 | |
1425 | |
1424 | /* If we are a multi part object, lets work our way through the check |
1426 | /* If we are a multi part object, lets work our way through the check |
1425 | * walk on's. |
1427 | * walk on's. |
1426 | */ |
1428 | */ |
1427 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1429 | for (tmp = op->more; tmp != NULL; tmp = tmp->more) |
1428 | if (check_move_on (tmp, originator)) |
1430 | if (check_move_on (tmp, originator)) |
1429 | return NULL; |
1431 | return 0; |
1430 | } |
1432 | } |
1431 | |
1433 | |
1432 | return op; |
1434 | return op; |
1433 | } |
1435 | } |
1434 | |
1436 | |
… | |
… | |
1450 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1452 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1451 | |
1453 | |
1452 | tmp1->x = op->x; |
1454 | tmp1->x = op->x; |
1453 | tmp1->y = op->y; |
1455 | tmp1->y = op->y; |
1454 | insert_ob_in_map (tmp1, op->map, op, 0); |
1456 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1457 | } |
|
|
1458 | |
|
|
1459 | object * |
|
|
1460 | object::insert_at (object *where, object *originator, int flags) |
|
|
1461 | { |
|
|
1462 | where->map->insert (this, where->x, where->y, originator, flags); |
1455 | } |
1463 | } |
1456 | |
1464 | |
1457 | /* |
1465 | /* |
1458 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1466 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1459 | * is returned contains nr objects, and the remaining parts contains |
1467 | * is returned contains nr objects, and the remaining parts contains |
1460 | * the rest (or is removed and freed if that number is 0). |
1468 | * the rest (or is removed and freed if that number is 0). |
1461 | * On failure, NULL is returned, and the reason put into the |
1469 | * On failure, NULL is returned, and the reason put into the |
1462 | * global static errmsg array. |
1470 | * global static errmsg array. |
1463 | */ |
1471 | */ |
1464 | |
|
|
1465 | object * |
1472 | object * |
1466 | get_split_ob (object *orig_ob, uint32 nr) |
1473 | get_split_ob (object *orig_ob, uint32 nr) |
1467 | { |
1474 | { |
1468 | object *newob; |
1475 | object *newob; |
1469 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1476 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1692 | if ((op->glow_radius != 0) && map) |
1699 | if ((op->glow_radius != 0) && map) |
1693 | { |
1700 | { |
1694 | #ifdef DEBUG_LIGHTS |
1701 | #ifdef DEBUG_LIGHTS |
1695 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1702 | LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); |
1696 | #endif /* DEBUG_LIGHTS */ |
1703 | #endif /* DEBUG_LIGHTS */ |
1697 | if (MAP_DARKNESS (map)) |
1704 | if (map->darkness) |
1698 | update_all_los (map, x, y); |
1705 | update_all_los (map, x, y); |
1699 | } |
1706 | } |
1700 | |
1707 | |
1701 | /* Client has no idea of ordering so lets not bother ordering it here. |
1708 | /* Client has no idea of ordering so lets not bother ordering it here. |
1702 | * It sure simplifies this function... |
1709 | * It sure simplifies this function... |
… | |
… | |
1707 | { |
1714 | { |
1708 | op->below = inv; |
1715 | op->below = inv; |
1709 | op->below->above = op; |
1716 | op->below->above = op; |
1710 | inv = op; |
1717 | inv = op; |
1711 | } |
1718 | } |
|
|
1719 | |
|
|
1720 | INVOKE_OBJECT (INSERT, this); |
1712 | |
1721 | |
1713 | return op; |
1722 | return op; |
1714 | } |
1723 | } |
1715 | |
1724 | |
1716 | /* |
1725 | /* |
… | |
… | |
1731 | * |
1740 | * |
1732 | * MSW 2001-07-08: Check all objects on space, not just those below |
1741 | * MSW 2001-07-08: Check all objects on space, not just those below |
1733 | * object being inserted. insert_ob_in_map may not put new objects |
1742 | * object being inserted. insert_ob_in_map may not put new objects |
1734 | * on top. |
1743 | * on top. |
1735 | */ |
1744 | */ |
1736 | |
|
|
1737 | int |
1745 | int |
1738 | check_move_on (object *op, object *originator) |
1746 | check_move_on (object *op, object *originator) |
1739 | { |
1747 | { |
1740 | object *tmp; |
1748 | object *tmp; |
1741 | maptile *m = op->map; |
1749 | maptile *m = op->map; |
… | |
… | |
1768 | |
1776 | |
1769 | /* The objects have to be checked from top to bottom. |
1777 | /* The objects have to be checked from top to bottom. |
1770 | * Hence, we first go to the top: |
1778 | * Hence, we first go to the top: |
1771 | */ |
1779 | */ |
1772 | |
1780 | |
1773 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) |
1781 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1774 | { |
1782 | { |
1775 | /* Trim the search when we find the first other spell effect |
1783 | /* Trim the search when we find the first other spell effect |
1776 | * this helps performance so that if a space has 50 spell objects, |
1784 | * this helps performance so that if a space has 50 spell objects, |
1777 | * we don't need to check all of them. |
1785 | * we don't need to check all of them. |
1778 | */ |
1786 | */ |
… | |
… | |
1833 | /* |
1841 | /* |
1834 | * present_arch(arch, map, x, y) searches for any objects with |
1842 | * present_arch(arch, map, x, y) searches for any objects with |
1835 | * a matching archetype at the given map and coordinates. |
1843 | * a matching archetype at the given map and coordinates. |
1836 | * The first matching object is returned, or NULL if none. |
1844 | * The first matching object is returned, or NULL if none. |
1837 | */ |
1845 | */ |
1838 | |
|
|
1839 | object * |
1846 | object * |
1840 | present_arch (const archetype *at, maptile *m, int x, int y) |
1847 | present_arch (const archetype *at, maptile *m, int x, int y) |
1841 | { |
1848 | { |
1842 | object * |
|
|
1843 | tmp; |
|
|
1844 | |
|
|
1845 | if (m == NULL || out_of_map (m, x, y)) |
1849 | if (m == NULL || out_of_map (m, x, y)) |
1846 | { |
1850 | { |
1847 | LOG (llevError, "Present_arch called outside map.\n"); |
1851 | LOG (llevError, "Present_arch called outside map.\n"); |
1848 | return NULL; |
1852 | return NULL; |
1849 | } |
1853 | } |
|
|
1854 | |
1850 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1855 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1851 | if (tmp->arch == at) |
1856 | if (tmp->arch == at) |
1852 | return tmp; |
1857 | return tmp; |
|
|
1858 | |
1853 | return NULL; |
1859 | return NULL; |
1854 | } |
1860 | } |
1855 | |
1861 | |
1856 | /* |
1862 | /* |
1857 | * present(type, map, x, y) searches for any objects with |
1863 | * present(type, map, x, y) searches for any objects with |
1858 | * a matching type variable at the given map and coordinates. |
1864 | * a matching type variable at the given map and coordinates. |
1859 | * The first matching object is returned, or NULL if none. |
1865 | * The first matching object is returned, or NULL if none. |
1860 | */ |
1866 | */ |
1861 | |
|
|
1862 | object * |
1867 | object * |
1863 | present (unsigned char type, maptile *m, int x, int y) |
1868 | present (unsigned char type, maptile *m, int x, int y) |
1864 | { |
1869 | { |
1865 | object * |
|
|
1866 | tmp; |
|
|
1867 | |
|
|
1868 | if (out_of_map (m, x, y)) |
1870 | if (out_of_map (m, x, y)) |
1869 | { |
1871 | { |
1870 | LOG (llevError, "Present called outside map.\n"); |
1872 | LOG (llevError, "Present called outside map.\n"); |
1871 | return NULL; |
1873 | return NULL; |
1872 | } |
1874 | } |
|
|
1875 | |
1873 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1876 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1874 | if (tmp->type == type) |
1877 | if (tmp->type == type) |
1875 | return tmp; |
1878 | return tmp; |
|
|
1879 | |
1876 | return NULL; |
1880 | return NULL; |
1877 | } |
1881 | } |
1878 | |
1882 | |
1879 | /* |
1883 | /* |
1880 | * present_in_ob(type, object) searches for any objects with |
1884 | * present_in_ob(type, object) searches for any objects with |
1881 | * a matching type variable in the inventory of the given object. |
1885 | * a matching type variable in the inventory of the given object. |
1882 | * The first matching object is returned, or NULL if none. |
1886 | * The first matching object is returned, or NULL if none. |
1883 | */ |
1887 | */ |
1884 | |
|
|
1885 | object * |
1888 | object * |
1886 | present_in_ob (unsigned char type, const object *op) |
1889 | present_in_ob (unsigned char type, const object *op) |
1887 | { |
1890 | { |
1888 | object * |
|
|
1889 | tmp; |
|
|
1890 | |
|
|
1891 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1891 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1892 | if (tmp->type == type) |
1892 | if (tmp->type == type) |
1893 | return tmp; |
1893 | return tmp; |
|
|
1894 | |
1894 | return NULL; |
1895 | return NULL; |
1895 | } |
1896 | } |
1896 | |
1897 | |
1897 | /* |
1898 | /* |
1898 | * present_in_ob (type, str, object) searches for any objects with |
1899 | * present_in_ob (type, str, object) searches for any objects with |
… | |
… | |
1906 | * str is the string to match against. Note that we match against |
1907 | * 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 |
1908 | * 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 |
1909 | * spell code can use one object type (force), but change it's name |
1909 | * to be unique. |
1910 | * to be unique. |
1910 | */ |
1911 | */ |
1911 | |
|
|
1912 | object * |
1912 | object * |
1913 | present_in_ob_by_name (int type, const char *str, const object *op) |
1913 | present_in_ob_by_name (int type, const char *str, const object *op) |
1914 | { |
1914 | { |
1915 | object * |
|
|
1916 | tmp; |
|
|
1917 | |
|
|
1918 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1915 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1919 | { |
|
|
1920 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1916 | if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) |
1921 | return tmp; |
1917 | return tmp; |
1922 | } |
1918 | |
1923 | return NULL; |
1919 | return 0; |
1924 | } |
1920 | } |
1925 | |
1921 | |
1926 | /* |
1922 | /* |
1927 | * present_arch_in_ob(archetype, object) searches for any objects with |
1923 | * present_arch_in_ob(archetype, object) searches for any objects with |
1928 | * a matching archetype in the inventory of the given object. |
1924 | * a matching archetype in the inventory of the given object. |
1929 | * The first matching object is returned, or NULL if none. |
1925 | * The first matching object is returned, or NULL if none. |
1930 | */ |
1926 | */ |
1931 | |
|
|
1932 | object * |
1927 | object * |
1933 | present_arch_in_ob (const archetype *at, const object *op) |
1928 | present_arch_in_ob (const archetype *at, const object *op) |
1934 | { |
1929 | { |
1935 | object * |
|
|
1936 | tmp; |
|
|
1937 | |
|
|
1938 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1930 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1939 | if (tmp->arch == at) |
1931 | if (tmp->arch == at) |
1940 | return tmp; |
1932 | return tmp; |
|
|
1933 | |
1941 | return NULL; |
1934 | return NULL; |
1942 | } |
1935 | } |
1943 | |
1936 | |
1944 | /* |
1937 | /* |
1945 | * activate recursively a flag on an object inventory |
1938 | * activate recursively a flag on an object inventory |
1946 | */ |
1939 | */ |
1947 | void |
1940 | void |
1948 | flag_inv (object *op, int flag) |
1941 | flag_inv (object *op, int flag) |
1949 | { |
1942 | { |
1950 | object * |
|
|
1951 | tmp; |
|
|
1952 | |
|
|
1953 | if (op->inv) |
1943 | if (op->inv) |
1954 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1944 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1955 | { |
1945 | { |
1956 | SET_FLAG (tmp, flag); |
1946 | SET_FLAG (tmp, flag); |
1957 | flag_inv (tmp, flag); |
1947 | flag_inv (tmp, flag); |
1958 | } |
1948 | } |
1959 | } /* |
1949 | } |
|
|
1950 | |
|
|
1951 | /* |
1960 | * desactivate recursively a flag on an object inventory |
1952 | * deactivate recursively a flag on an object inventory |
1961 | */ |
1953 | */ |
1962 | void |
1954 | void |
1963 | unflag_inv (object *op, int flag) |
1955 | unflag_inv (object *op, int flag) |
1964 | { |
1956 | { |
1965 | object * |
|
|
1966 | tmp; |
|
|
1967 | |
|
|
1968 | if (op->inv) |
1957 | if (op->inv) |
1969 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1958 | for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1970 | { |
1959 | { |
1971 | CLEAR_FLAG (tmp, flag); |
1960 | CLEAR_FLAG (tmp, flag); |
1972 | unflag_inv (tmp, flag); |
1961 | unflag_inv (tmp, flag); |
1973 | } |
1962 | } |
1974 | } |
1963 | } |
… | |
… | |
1977 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1966 | * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in |
1978 | * all it's inventory (recursively). |
1967 | * all it's inventory (recursively). |
1979 | * If checksums are used, a player will get set_cheat called for |
1968 | * 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. |
1969 | * him/her-self and all object carried by a call to this function. |
1981 | */ |
1970 | */ |
1982 | |
|
|
1983 | void |
1971 | void |
1984 | set_cheat (object *op) |
1972 | set_cheat (object *op) |
1985 | { |
1973 | { |
1986 | SET_FLAG (op, FLAG_WAS_WIZ); |
1974 | SET_FLAG (op, FLAG_WAS_WIZ); |
1987 | flag_inv (op, FLAG_WAS_WIZ); |
1975 | flag_inv (op, FLAG_WAS_WIZ); |
… | |
… | |
2006 | * because arch_blocked (now ob_blocked) needs to know the movement type |
1994 | * 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 |
1995 | * 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 |
1996 | * the archetype because that isn't correct if the monster has been |
2009 | * customized, changed states, etc. |
1997 | * customized, changed states, etc. |
2010 | */ |
1998 | */ |
2011 | |
|
|
2012 | int |
1999 | int |
2013 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2000 | find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) |
2014 | { |
2001 | { |
2015 | int |
|
|
2016 | i, |
|
|
2017 | index = 0, flag; |
2002 | int index = 0, flag; |
2018 | static int |
|
|
2019 | altern[SIZEOFFREE]; |
2003 | int altern[SIZEOFFREE]; |
2020 | |
2004 | |
2021 | for (i = start; i < stop; i++) |
2005 | for (int i = start; i < stop; i++) |
2022 | { |
2006 | { |
2023 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2007 | flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); |
2024 | if (!flag) |
2008 | if (!flag) |
2025 | altern[index++] = i; |
2009 | altern [index++] = i; |
2026 | |
2010 | |
2027 | /* Basically, if we find a wall on a space, we cut down the search size. |
2011 | /* 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. |
2012 | * 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 - |
2013 | * 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 |
2014 | * 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 |
2030 | * find_first_free_spot(archetype, maptile, x, y) works like |
2047 | * find_free_spot(), but it will search max number of squares. |
2031 | * find_free_spot(), but it will search max number of squares. |
2048 | * But it will return the first available spot, not a random choice. |
2032 | * 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. |
2033 | * Changed 0.93.2: Have it return -1 if there is no free spot available. |
2050 | */ |
2034 | */ |
2051 | |
|
|
2052 | int |
2035 | int |
2053 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2036 | find_first_free_spot (const object *ob, maptile *m, int x, int y) |
2054 | { |
2037 | { |
2055 | int |
|
|
2056 | i; |
|
|
2057 | |
|
|
2058 | for (i = 0; i < SIZEOFFREE; i++) |
2038 | for (int i = 0; i < SIZEOFFREE; i++) |
2059 | { |
|
|
2060 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2039 | if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) |
2061 | return i; |
2040 | return i; |
2062 | } |
2041 | |
2063 | return -1; |
2042 | return -1; |
2064 | } |
2043 | } |
2065 | |
2044 | |
2066 | /* |
2045 | /* |
2067 | * The function permute(arr, begin, end) randomly reorders the array |
2046 | * The function permute(arr, begin, end) randomly reorders the array |
2068 | * arr[begin..end-1]. |
2047 | * arr[begin..end-1]. |
|
|
2048 | * now uses a fisher-yates shuffle, old permute was broken |
2069 | */ |
2049 | */ |
2070 | static void |
2050 | static void |
2071 | permute (int *arr, int begin, int end) |
2051 | permute (int *arr, int begin, int end) |
2072 | { |
2052 | { |
2073 | int |
2053 | arr += begin; |
2074 | i, |
|
|
2075 | j, |
|
|
2076 | tmp, |
|
|
2077 | len; |
|
|
2078 | |
|
|
2079 | len = end - begin; |
2054 | end -= begin; |
2080 | for (i = begin; i < end; i++) |
|
|
2081 | { |
|
|
2082 | j = begin + RANDOM () % len; |
|
|
2083 | |
2055 | |
2084 | tmp = arr[i]; |
2056 | while (--end) |
2085 | arr[i] = arr[j]; |
2057 | swap (arr [end], arr [RANDOM () % (end + 1)]); |
2086 | arr[j] = tmp; |
|
|
2087 | } |
|
|
2088 | } |
2058 | } |
2089 | |
2059 | |
2090 | /* new function to make monster searching more efficient, and effective! |
2060 | /* new function to make monster searching more efficient, and effective! |
2091 | * This basically returns a randomized array (in the passed pointer) of |
2061 | * 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 |
2062 | * 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. |
2065 | * the 3x3 area will be searched, just not in a predictable order. |
2096 | */ |
2066 | */ |
2097 | void |
2067 | void |
2098 | get_search_arr (int *search_arr) |
2068 | get_search_arr (int *search_arr) |
2099 | { |
2069 | { |
2100 | int |
2070 | int i; |
2101 | i; |
|
|
2102 | |
2071 | |
2103 | for (i = 0; i < SIZEOFFREE; i++) |
2072 | for (i = 0; i < SIZEOFFREE; i++) |
2104 | { |
|
|
2105 | search_arr[i] = i; |
2073 | search_arr[i] = i; |
2106 | } |
|
|
2107 | |
2074 | |
2108 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2075 | permute (search_arr, 1, SIZEOFFREE1 + 1); |
2109 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2076 | permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); |
2110 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2077 | permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); |
2111 | } |
2078 | } |
… | |
… | |
2120 | * Perhaps incorrectly, but I'm making the assumption that exclude |
2087 | * 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 |
2088 | * 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 |
2089 | * because we have to know what movement the thing looking to move |
2123 | * there is capable of. |
2090 | * there is capable of. |
2124 | */ |
2091 | */ |
2125 | |
|
|
2126 | int |
2092 | int |
2127 | find_dir (maptile *m, int x, int y, object *exclude) |
2093 | find_dir (maptile *m, int x, int y, object *exclude) |
2128 | { |
2094 | { |
2129 | int |
|
|
2130 | i, |
|
|
2131 | max = SIZEOFFREE, mflags; |
2095 | int i, max = SIZEOFFREE, mflags; |
2132 | |
2096 | |
2133 | sint16 nx, ny; |
2097 | sint16 nx, ny; |
2134 | object * |
2098 | object *tmp; |
2135 | tmp; |
|
|
2136 | maptile * |
2099 | maptile *mp; |
2137 | mp; |
|
|
2138 | |
2100 | |
2139 | MoveType blocked, move_type; |
2101 | MoveType blocked, move_type; |
2140 | |
2102 | |
2141 | if (exclude && exclude->head) |
2103 | if (exclude && exclude->head) |
2142 | { |
2104 | { |
… | |
… | |
2159 | |
2121 | |
2160 | if (mflags & P_OUT_OF_MAP) |
2122 | if (mflags & P_OUT_OF_MAP) |
2161 | max = maxfree[i]; |
2123 | max = maxfree[i]; |
2162 | else |
2124 | else |
2163 | { |
2125 | { |
2164 | blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); |
2126 | mapspace &ms = mp->at (nx, ny); |
|
|
2127 | |
|
|
2128 | blocked = ms.move_block; |
2165 | |
2129 | |
2166 | if ((move_type & blocked) == move_type) |
2130 | if ((move_type & blocked) == move_type) |
2167 | max = maxfree[i]; |
2131 | max = maxfree[i]; |
2168 | else if (mflags & P_IS_ALIVE) |
2132 | else if (mflags & P_IS_ALIVE) |
2169 | { |
2133 | { |
2170 | for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) |
2134 | 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))) |
2135 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
|
|
2136 | && (tmp != exclude || (tmp->head && tmp->head != exclude))) |
2172 | break; |
2137 | break; |
2173 | |
2138 | |
2174 | if (tmp) |
2139 | if (tmp) |
2175 | return freedir[i]; |
2140 | return freedir[i]; |
2176 | } |
2141 | } |
… | |
… | |
2182 | |
2147 | |
2183 | /* |
2148 | /* |
2184 | * distance(object 1, object 2) will return the square of the |
2149 | * distance(object 1, object 2) will return the square of the |
2185 | * distance between the two given objects. |
2150 | * distance between the two given objects. |
2186 | */ |
2151 | */ |
2187 | |
|
|
2188 | int |
2152 | int |
2189 | distance (const object *ob1, const object *ob2) |
2153 | distance (const object *ob1, const object *ob2) |
2190 | { |
2154 | { |
2191 | int i; |
|
|
2192 | |
|
|
2193 | i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2155 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2194 | return i; |
|
|
2195 | } |
2156 | } |
2196 | |
2157 | |
2197 | /* |
2158 | /* |
2198 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2159 | * 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 |
2160 | * an object which has subtracted the x and y coordinates of another |
2200 | * object, needs to travel toward it. |
2161 | * object, needs to travel toward it. |
2201 | */ |
2162 | */ |
2202 | |
|
|
2203 | int |
2163 | int |
2204 | find_dir_2 (int x, int y) |
2164 | find_dir_2 (int x, int y) |
2205 | { |
2165 | { |
2206 | int q; |
2166 | int q; |
2207 | |
2167 | |
… | |
… | |
2246 | int |
2206 | int |
2247 | absdir (int d) |
2207 | absdir (int d) |
2248 | { |
2208 | { |
2249 | while (d < 1) |
2209 | while (d < 1) |
2250 | d += 8; |
2210 | d += 8; |
|
|
2211 | |
2251 | while (d > 8) |
2212 | while (d > 8) |
2252 | d -= 8; |
2213 | d -= 8; |
|
|
2214 | |
2253 | return d; |
2215 | return d; |
2254 | } |
2216 | } |
2255 | |
2217 | |
2256 | /* |
2218 | /* |
2257 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2219 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
… | |
… | |
2259 | */ |
2221 | */ |
2260 | |
2222 | |
2261 | int |
2223 | int |
2262 | dirdiff (int dir1, int dir2) |
2224 | dirdiff (int dir1, int dir2) |
2263 | { |
2225 | { |
2264 | int |
2226 | int d; |
2265 | d; |
|
|
2266 | |
2227 | |
2267 | d = abs (dir1 - dir2); |
2228 | d = abs (dir1 - dir2); |
2268 | if (d > 4) |
2229 | if (d > 4) |
2269 | d = 8 - d; |
2230 | d = 8 - d; |
|
|
2231 | |
2270 | return d; |
2232 | return d; |
2271 | } |
2233 | } |
2272 | |
2234 | |
2273 | /* peterm: |
2235 | /* peterm: |
2274 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2236 | * 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 |
2239 | * 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. |
2240 | * 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 |
2241 | * Moved from spell_util.c to object.c with the other related direction |
2280 | * functions. |
2242 | * functions. |
2281 | */ |
2243 | */ |
2282 | |
|
|
2283 | int |
|
|
2284 | reduction_dir[SIZEOFFREE][3] = { |
2244 | int reduction_dir[SIZEOFFREE][3] = { |
2285 | {0, 0, 0}, /* 0 */ |
2245 | {0, 0, 0}, /* 0 */ |
2286 | {0, 0, 0}, /* 1 */ |
2246 | {0, 0, 0}, /* 1 */ |
2287 | {0, 0, 0}, /* 2 */ |
2247 | {0, 0, 0}, /* 2 */ |
2288 | {0, 0, 0}, /* 3 */ |
2248 | {0, 0, 0}, /* 3 */ |
2289 | {0, 0, 0}, /* 4 */ |
2249 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2439 | /* Basically, we save the content of the string to a temp file, then call */ |
2399 | /* 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, */ |
2400 | /* 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. */ |
2401 | /* 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. */ |
2402 | /* Remember not to use load_object_str in a time-critical situation. */ |
2443 | /* Also remember that multiparts objects are not supported for now. */ |
2403 | /* Also remember that multiparts objects are not supported for now. */ |
2444 | |
|
|
2445 | object * |
2404 | object * |
2446 | load_object_str (const char *obstr) |
2405 | load_object_str (const char *obstr) |
2447 | { |
2406 | { |
2448 | object *op; |
2407 | object *op; |
2449 | char filename[MAX_BUF]; |
2408 | char filename[MAX_BUF]; |
… | |
… | |
2479 | * returns NULL if no match. |
2438 | * returns NULL if no match. |
2480 | */ |
2439 | */ |
2481 | object * |
2440 | object * |
2482 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2441 | find_obj_by_type_subtype (const object *who, int type, int subtype) |
2483 | { |
2442 | { |
2484 | object *tmp; |
|
|
2485 | |
|
|
2486 | for (tmp = who->inv; tmp; tmp = tmp->below) |
2443 | for (object *tmp = who->inv; tmp; tmp = tmp->below) |
2487 | if (tmp->type == type && tmp->subtype == subtype) |
2444 | if (tmp->type == type && tmp->subtype == subtype) |
2488 | return tmp; |
2445 | return tmp; |
2489 | |
2446 | |
2490 | return NULL; |
2447 | return 0; |
2491 | } |
2448 | } |
2492 | |
2449 | |
2493 | /* If ob has a field named key, return the link from the list, |
2450 | /* If ob has a field named key, return the link from the list, |
2494 | * otherwise return NULL. |
2451 | * otherwise return NULL. |
2495 | * |
2452 | * |
… | |
… | |
2497 | * do the desired thing. |
2454 | * do the desired thing. |
2498 | */ |
2455 | */ |
2499 | key_value * |
2456 | key_value * |
2500 | get_ob_key_link (const object *ob, const char *key) |
2457 | get_ob_key_link (const object *ob, const char *key) |
2501 | { |
2458 | { |
2502 | key_value *link; |
|
|
2503 | |
|
|
2504 | for (link = ob->key_values; link != NULL; link = link->next) |
2459 | for (key_value *link = ob->key_values; link; link = link->next) |
2505 | if (link->key == key) |
2460 | if (link->key == key) |
2506 | return link; |
2461 | return link; |
2507 | |
2462 | |
2508 | return NULL; |
2463 | return 0; |
2509 | } |
2464 | } |
2510 | |
2465 | |
2511 | /* |
2466 | /* |
2512 | * Returns the value of op has an extra_field for key, or NULL. |
2467 | * Returns the value of op has an extra_field for key, or NULL. |
2513 | * |
2468 | * |
… | |
… | |
2553 | * Returns TRUE on success. |
2508 | * Returns TRUE on success. |
2554 | */ |
2509 | */ |
2555 | int |
2510 | int |
2556 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2511 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
2557 | { |
2512 | { |
2558 | key_value * |
|
|
2559 | field = NULL, *last = NULL; |
2513 | key_value *field = NULL, *last = NULL; |
2560 | |
2514 | |
2561 | for (field = op->key_values; field != NULL; field = field->next) |
2515 | for (field = op->key_values; field != NULL; field = field->next) |
2562 | { |
2516 | { |
2563 | if (field->key != canonical_key) |
2517 | if (field->key != canonical_key) |
2564 | { |
2518 | { |
… | |
… | |
2592 | /* IF we get here, key doesn't exist */ |
2546 | /* IF we get here, key doesn't exist */ |
2593 | |
2547 | |
2594 | /* No field, we'll have to add it. */ |
2548 | /* No field, we'll have to add it. */ |
2595 | |
2549 | |
2596 | if (!add_key) |
2550 | if (!add_key) |
2597 | { |
|
|
2598 | return FALSE; |
2551 | return FALSE; |
2599 | } |
2552 | |
2600 | /* There isn't any good reason to store a null |
2553 | /* There isn't any good reason to store a null |
2601 | * value in the key/value list. If the archetype has |
2554 | * value in the key/value list. If the archetype has |
2602 | * this key, then we should also have it, so shouldn't |
2555 | * this key, then we should also have it, so shouldn't |
2603 | * be here. If user wants to store empty strings, |
2556 | * be here. If user wants to store empty strings, |
2604 | * should pass in "" |
2557 | * should pass in "" |
… | |
… | |
2653 | } |
2606 | } |
2654 | else |
2607 | else |
2655 | item = item->env; |
2608 | item = item->env; |
2656 | } |
2609 | } |
2657 | |
2610 | |
|
|
2611 | |
|
|
2612 | const char * |
|
|
2613 | object::flag_desc (char *desc, int len) const |
|
|
2614 | { |
|
|
2615 | char *p = desc; |
|
|
2616 | bool first = true; |
|
|
2617 | |
|
|
2618 | *p = 0; |
|
|
2619 | |
|
|
2620 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2621 | { |
|
|
2622 | if (len <= 10) // magic constant! |
|
|
2623 | { |
|
|
2624 | snprintf (p, len, ",..."); |
|
|
2625 | break; |
|
|
2626 | } |
|
|
2627 | |
|
|
2628 | if (flag [i]) |
|
|
2629 | { |
|
|
2630 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2631 | len -= cnt; |
|
|
2632 | p += cnt; |
|
|
2633 | first = false; |
|
|
2634 | } |
|
|
2635 | } |
|
|
2636 | |
|
|
2637 | return desc; |
|
|
2638 | } |
|
|
2639 | |
2658 | // return a suitable string describing an objetc in enough detail to find it |
2640 | // return a suitable string describing an object in enough detail to find it |
2659 | const char * |
2641 | const char * |
2660 | object::debug_desc (char *info) const |
2642 | object::debug_desc (char *info) const |
2661 | { |
2643 | { |
|
|
2644 | char flagdesc[512]; |
2662 | char info2[256 * 3]; |
2645 | char info2[256 * 4]; |
2663 | char *p = info; |
2646 | char *p = info; |
2664 | |
2647 | |
2665 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2648 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2666 | count, |
2649 | count, uuid.seq, |
2667 | &name, |
2650 | &name, |
2668 | title ? " " : "", |
2651 | title ? "\",title:" : "", |
2669 | title ? (const char *)title : ""); |
2652 | title ? (const char *)title : "", |
|
|
2653 | flag_desc (flagdesc, 512), type); |
2670 | |
2654 | |
2671 | if (env) |
2655 | if (env) |
2672 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2656 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2673 | |
2657 | |
2674 | if (map) |
2658 | if (map) |
2675 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2659 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2676 | |
2660 | |
2677 | return info; |
2661 | return info; |
2678 | } |
2662 | } |
2679 | |
2663 | |
2680 | const char * |
2664 | const char * |