1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | CrossFire, A Multiplayer game for X-windows |
3 | |
3 | |
|
|
4 | Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 2001 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | |
7 | This program is free software; you can redistribute it and/or modify |
8 | This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | it under the terms of the GNU General Public License as published by |
… | |
… | |
36 | |
37 | |
37 | int nrofallocobjects = 0; |
38 | int nrofallocobjects = 0; |
38 | static UUID uuid; |
39 | static UUID uuid; |
39 | const uint64 UUID_SKIP = 1<<19; |
40 | const uint64 UUID_SKIP = 1<<19; |
40 | |
41 | |
41 | object *active_objects; /* List of active objects that need to be processed */ |
42 | objectvec objects; |
|
|
43 | activevec actives; |
42 | |
44 | |
43 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
45 | short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
44 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
46 | 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 |
45 | }; |
47 | }; |
46 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
48 | short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
… | |
… | |
190 | * Check nrof variable *before* calling can_merge() |
192 | * Check nrof variable *before* calling can_merge() |
191 | * |
193 | * |
192 | * Improvements made with merge: Better checking on potion, and also |
194 | * Improvements made with merge: Better checking on potion, and also |
193 | * check weight |
195 | * check weight |
194 | */ |
196 | */ |
195 | |
|
|
196 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | bool object::can_merge_slow (object *ob1, object *ob2) |
197 | { |
198 | { |
198 | /* A couple quicksanity checks */ |
199 | /* A couple quicksanity checks */ |
199 | if (ob1 == ob2 |
200 | if (ob1 == ob2 |
200 | || ob1->type != ob2->type |
201 | || ob1->type != ob2->type |
… | |
… | |
277 | |
278 | |
278 | /* Note sure why the following is the case - either the object has to |
279 | /* 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 |
280 | * be animated or have a very low speed. Is this an attempted monster |
280 | * check? |
281 | * check? |
281 | */ |
282 | */ |
282 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) |
283 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
283 | return 0; |
284 | return 0; |
284 | |
285 | |
285 | switch (ob1->type) |
286 | switch (ob1->type) |
286 | { |
287 | { |
287 | case SCROLL: |
288 | case SCROLL: |
… | |
… | |
391 | } |
392 | } |
392 | |
393 | |
393 | /* |
394 | /* |
394 | * Returns the object which has the count-variable equal to the argument. |
395 | * Returns the object which has the count-variable equal to the argument. |
395 | */ |
396 | */ |
396 | |
|
|
397 | object * |
397 | object * |
398 | find_object (tag_t i) |
398 | find_object (tag_t i) |
399 | { |
399 | { |
400 | for (object *op = object::first; op; op = op->next) |
400 | return ((unsigned int)i) < objects.size () |
401 | if (op->count == i) |
401 | ? objects [i] |
402 | return op; |
402 | : 0; |
403 | |
|
|
404 | return 0; |
|
|
405 | } |
403 | } |
406 | |
404 | |
407 | /* |
405 | /* |
408 | * Returns the first object which has a name equal to the argument. |
406 | * Returns the first object which has a name equal to the argument. |
409 | * Used only by the patch command, but not all that useful. |
407 | * Used only by the patch command, but not all that useful. |
410 | * Enables features like "patch <name-of-other-player> food 999" |
408 | * Enables features like "patch <name-of-other-player> food 999" |
411 | */ |
409 | */ |
412 | |
|
|
413 | object * |
410 | object * |
414 | find_object_name (const char *str) |
411 | find_object_name (const char *str) |
415 | { |
412 | { |
416 | shstr_cmp str_ (str); |
413 | shstr_cmp str_ (str); |
417 | object *op; |
414 | object *op; |
418 | |
415 | |
419 | for (op = object::first; op != NULL; op = op->next) |
416 | for_all_objects (op) |
420 | if (op->name == str_) |
417 | if (op->name == str_) |
421 | break; |
418 | break; |
422 | |
419 | |
423 | return op; |
420 | return op; |
424 | } |
421 | } |
… | |
… | |
538 | /* |
535 | /* |
539 | * If an object with the IS_TURNABLE() flag needs to be turned due |
536 | * If an object with the IS_TURNABLE() flag needs to be turned due |
540 | * to the closest player being on the other side, this function can |
537 | * to the closest player being on the other side, this function can |
541 | * be called to update the face variable, _and_ how it looks on the map. |
538 | * be called to update the face variable, _and_ how it looks on the map. |
542 | */ |
539 | */ |
543 | |
|
|
544 | void |
540 | void |
545 | update_turn_face (object *op) |
541 | update_turn_face (object *op) |
546 | { |
542 | { |
547 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) |
543 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
548 | return; |
544 | return; |
|
|
545 | |
549 | SET_ANIMATION (op, op->direction); |
546 | SET_ANIMATION (op, op->direction); |
550 | update_object (op, UP_OBJ_FACE); |
547 | update_object (op, UP_OBJ_FACE); |
551 | } |
548 | } |
552 | |
549 | |
553 | /* |
550 | /* |
… | |
… | |
556 | * This function needs to be called whenever the speed of an object changes. |
553 | * This function needs to be called whenever the speed of an object changes. |
557 | */ |
554 | */ |
558 | void |
555 | void |
559 | object::set_speed (float speed) |
556 | object::set_speed (float speed) |
560 | { |
557 | { |
561 | extern int arch_init; |
|
|
562 | |
|
|
563 | /* No reason putting the archetypes objects on the speed list, |
|
|
564 | * since they never really need to be updated. |
|
|
565 | */ |
|
|
566 | if (flag [FLAG_FREED] && speed) |
558 | if (flag [FLAG_FREED] && speed) |
567 | { |
559 | { |
568 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
560 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
569 | speed = 0; |
561 | speed = 0; |
570 | } |
562 | } |
571 | |
563 | |
572 | this->speed = speed; |
564 | this->speed = speed; |
573 | |
565 | |
574 | if (arch_init) |
566 | if (has_active_speed ()) |
575 | return; |
567 | activate (); |
576 | |
|
|
577 | if (FABS (speed) > MIN_ACTIVE_SPEED) |
|
|
578 | { |
|
|
579 | /* If already on active list, don't do anything */ |
|
|
580 | if (active_next || active_prev || this == active_objects) |
|
|
581 | return; |
|
|
582 | |
|
|
583 | /* process_events() expects us to insert the object at the beginning |
|
|
584 | * of the list. */ |
|
|
585 | active_next = active_objects; |
|
|
586 | |
|
|
587 | if (active_next) |
|
|
588 | active_next->active_prev = this; |
|
|
589 | |
|
|
590 | active_objects = this; |
|
|
591 | } |
|
|
592 | else |
568 | else |
593 | { |
569 | deactivate (); |
594 | /* If not on the active list, nothing needs to be done */ |
|
|
595 | if (!active_next && !active_prev && this != active_objects) |
|
|
596 | return; |
|
|
597 | |
|
|
598 | if (!active_prev) |
|
|
599 | { |
|
|
600 | active_objects = active_next; |
|
|
601 | |
|
|
602 | if (active_next) |
|
|
603 | active_next->active_prev = 0; |
|
|
604 | } |
|
|
605 | else |
|
|
606 | { |
|
|
607 | active_prev->active_next = active_next; |
|
|
608 | |
|
|
609 | if (active_next) |
|
|
610 | active_next->active_prev = active_prev; |
|
|
611 | } |
|
|
612 | |
|
|
613 | active_next = 0; |
|
|
614 | active_prev = 0; |
|
|
615 | } |
|
|
616 | } |
|
|
617 | |
|
|
618 | /* This function removes object 'op' from the list of active |
|
|
619 | * objects. |
|
|
620 | * This should only be used for style maps or other such |
|
|
621 | * reference maps where you don't want an object that isn't |
|
|
622 | * in play chewing up cpu time getting processed. |
|
|
623 | * The reverse of this is to call update_ob_speed, which |
|
|
624 | * will do the right thing based on the speed of the object. |
|
|
625 | */ |
|
|
626 | void |
|
|
627 | remove_from_active_list (object *op) |
|
|
628 | { |
|
|
629 | /* If not on the active list, nothing needs to be done */ |
|
|
630 | if (!op->active_next && !op->active_prev && op != active_objects) |
|
|
631 | return; |
|
|
632 | |
|
|
633 | if (op->active_prev == NULL) |
|
|
634 | { |
|
|
635 | active_objects = op->active_next; |
|
|
636 | if (op->active_next != NULL) |
|
|
637 | op->active_next->active_prev = NULL; |
|
|
638 | } |
|
|
639 | else |
|
|
640 | { |
|
|
641 | op->active_prev->active_next = op->active_next; |
|
|
642 | if (op->active_next) |
|
|
643 | op->active_next->active_prev = op->active_prev; |
|
|
644 | } |
|
|
645 | op->active_next = NULL; |
|
|
646 | op->active_prev = NULL; |
|
|
647 | } |
570 | } |
648 | |
571 | |
649 | /* |
572 | /* |
650 | * update_object() updates the the map. |
573 | * update_object() updates the the map. |
651 | * It takes into account invisible objects (and represent squares covered |
574 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
699 | return; |
622 | return; |
700 | } |
623 | } |
701 | |
624 | |
702 | mapspace &m = op->ms (); |
625 | mapspace &m = op->ms (); |
703 | |
626 | |
704 | if (m.flags_ & P_NEED_UPDATE) |
627 | if (!(m.flags_ & P_UPTODATE)) |
705 | /* nop */; |
628 | /* nop */; |
706 | else if (action == UP_OBJ_INSERT) |
629 | else if (action == UP_OBJ_INSERT) |
707 | { |
630 | { |
708 | // this is likely overkill, TODO: revisit (schmorp) |
631 | // this is likely overkill, TODO: revisit (schmorp) |
709 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
632 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
718 | /* This isn't perfect, but I don't expect a lot of objects to |
641 | /* This isn't perfect, but I don't expect a lot of objects to |
719 | * to have move_allow right now. |
642 | * to have move_allow right now. |
720 | */ |
643 | */ |
721 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
644 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
722 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
645 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
723 | m.flags_ = P_NEED_UPDATE; |
646 | m.flags_ = 0; |
724 | } |
647 | } |
725 | /* if the object is being removed, we can't make intelligent |
648 | /* if the object is being removed, we can't make intelligent |
726 | * decisions, because remove_ob can't really pass the object |
649 | * decisions, because remove_ob can't really pass the object |
727 | * that is being removed. |
650 | * that is being removed. |
728 | */ |
651 | */ |
729 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
652 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
730 | m.flags_ = P_NEED_UPDATE; |
653 | m.flags_ = 0; |
731 | else if (action == UP_OBJ_FACE) |
654 | else if (action == UP_OBJ_FACE) |
732 | /* Nothing to do for that case */ ; |
655 | /* Nothing to do for that case */ ; |
733 | else |
656 | else |
734 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
657 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
735 | |
658 | |
736 | if (op->more) |
659 | if (op->more) |
737 | update_object (op->more, action); |
660 | update_object (op->more, action); |
738 | } |
661 | } |
739 | |
662 | |
740 | object::vector object::objects; // not yet used |
|
|
741 | object *object::first; |
663 | object *object::first; |
742 | |
664 | |
743 | object::object () |
665 | object::object () |
744 | { |
666 | { |
745 | SET_FLAG (this, FLAG_REMOVED); |
667 | SET_FLAG (this, FLAG_REMOVED); |
… | |
… | |
753 | free_key_values (this); |
675 | free_key_values (this); |
754 | } |
676 | } |
755 | |
677 | |
756 | void object::link () |
678 | void object::link () |
757 | { |
679 | { |
758 | count = ++ob_count; |
|
|
759 | uuid = gen_uuid (); |
680 | uuid = gen_uuid (); |
760 | |
681 | |
761 | prev = 0; |
682 | refcnt_inc (); |
762 | next = object::first; |
683 | objects.insert (this); |
763 | |
|
|
764 | if (object::first) |
|
|
765 | object::first->prev = this; |
|
|
766 | |
|
|
767 | object::first = this; |
|
|
768 | } |
684 | } |
769 | |
685 | |
770 | void object::unlink () |
686 | void object::unlink () |
771 | { |
687 | { |
772 | if (this == object::first) |
688 | objects.erase (this); |
773 | object::first = next; |
689 | refcnt_dec (); |
774 | |
|
|
775 | /* Remove this object from the list of used objects */ |
|
|
776 | if (prev) prev->next = next; |
|
|
777 | if (next) next->prev = prev; |
|
|
778 | |
|
|
779 | prev = 0; |
|
|
780 | next = 0; |
|
|
781 | } |
|
|
782 | |
|
|
783 | object *object::create () |
|
|
784 | { |
|
|
785 | object *op = new object; |
|
|
786 | op->link (); |
|
|
787 | return op; |
|
|
788 | } |
690 | } |
789 | |
691 | |
790 | void |
692 | void |
791 | object::do_destroy () |
693 | object::activate () |
792 | { |
694 | { |
793 | attachable::do_destroy (); |
695 | /* If already on active list, don't do anything */ |
794 | |
696 | if (active) |
795 | if (flag [FLAG_IS_LINKED]) |
|
|
796 | remove_button_link (this); |
|
|
797 | |
|
|
798 | if (flag [FLAG_FRIENDLY]) |
|
|
799 | remove_friendly_object (this); |
|
|
800 | |
|
|
801 | if (!flag [FLAG_REMOVED]) |
|
|
802 | remove (); |
|
|
803 | |
|
|
804 | if (flag [FLAG_FREED]) |
|
|
805 | return; |
697 | return; |
806 | |
698 | |
807 | flag [FLAG_FREED] = 1; |
699 | if (has_active_speed ()) |
|
|
700 | actives.insert (this); |
|
|
701 | } |
808 | |
702 | |
809 | while (inv) |
703 | void |
810 | inv->destroy (); |
704 | object::activate_recursive () |
|
|
705 | { |
|
|
706 | activate (); |
811 | |
707 | |
812 | set_speed (0); |
708 | for (object *op = inv; op; op = op->below) |
813 | unlink (); |
709 | op->activate_recursive (); |
|
|
710 | } |
814 | |
711 | |
815 | // hack to ensure that freed objects still have a valid map |
712 | /* This function removes object 'op' from the list of active |
816 | { |
713 | * objects. |
817 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
714 | * This should only be used for style maps or other such |
|
|
715 | * reference maps where you don't want an object that isn't |
|
|
716 | * in play chewing up cpu time getting processed. |
|
|
717 | * The reverse of this is to call update_ob_speed, which |
|
|
718 | * will do the right thing based on the speed of the object. |
|
|
719 | */ |
|
|
720 | void |
|
|
721 | object::deactivate () |
|
|
722 | { |
|
|
723 | /* If not on the active list, nothing needs to be done */ |
|
|
724 | if (!active) |
|
|
725 | return; |
818 | |
726 | |
819 | if (!freed_map) |
727 | actives.erase (this); |
|
|
728 | } |
|
|
729 | |
|
|
730 | void |
|
|
731 | object::deactivate_recursive () |
|
|
732 | { |
|
|
733 | for (object *op = inv; op; op = op->below) |
|
|
734 | op->deactivate_recursive (); |
|
|
735 | |
|
|
736 | deactivate (); |
|
|
737 | } |
|
|
738 | |
|
|
739 | void |
|
|
740 | object::set_flag_inv (int flag, int value) |
|
|
741 | { |
|
|
742 | for (object *op = inv; op; op = op->below) |
820 | { |
743 | { |
821 | freed_map = new maptile; |
744 | op->flag [flag] = value; |
822 | |
745 | op->set_flag_inv (flag, value); |
823 | freed_map->name = "/internal/freed_objects_map"; |
|
|
824 | freed_map->width = 3; |
|
|
825 | freed_map->height = 3; |
|
|
826 | |
|
|
827 | freed_map->allocate (); |
|
|
828 | } |
746 | } |
829 | |
|
|
830 | map = freed_map; |
|
|
831 | x = 1; |
|
|
832 | y = 1; |
|
|
833 | } |
|
|
834 | |
|
|
835 | head = 0; |
|
|
836 | |
|
|
837 | if (more) |
|
|
838 | { |
|
|
839 | more->destroy (); |
|
|
840 | more = 0; |
|
|
841 | } |
|
|
842 | |
|
|
843 | // clear those pointers that likely might have circular references to us |
|
|
844 | owner = 0; |
|
|
845 | enemy = 0; |
|
|
846 | attacked_by = 0; |
|
|
847 | |
|
|
848 | // only relevant for players(?), but make sure of it anyways |
|
|
849 | contr = 0; |
|
|
850 | } |
747 | } |
851 | |
748 | |
852 | /* |
749 | /* |
853 | * Remove and free all objects in the inventory of the given object. |
750 | * Remove and free all objects in the inventory of the given object. |
854 | * object.c ? |
751 | * object.c ? |
855 | */ |
752 | */ |
856 | void |
753 | void |
857 | object::destroy_inv (bool drop_to_ground) |
754 | object::destroy_inv (bool drop_to_ground) |
858 | { |
755 | { |
|
|
756 | // need to check first, because the checks below might segfault |
|
|
757 | // as we might be on an invalid mapspace and crossfire code |
|
|
758 | // is too buggy to ensure that the inventory is empty. |
|
|
759 | // corollary: if you create arrows etc. with stuff in tis inventory, |
|
|
760 | // cf will crash below with off-map x and y |
|
|
761 | if (!inv) |
|
|
762 | return; |
|
|
763 | |
859 | /* Only if the space blocks everything do we not process - |
764 | /* Only if the space blocks everything do we not process - |
860 | * if some form of movement is allowed, let objects |
765 | * if some form of movement is allowed, let objects |
861 | * drop on that space. |
766 | * drop on that space. |
862 | */ |
767 | */ |
863 | if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) |
768 | if (!drop_to_ground |
|
|
769 | || !map |
|
|
770 | || map->in_memory != MAP_IN_MEMORY |
|
|
771 | || ms ().move_block == MOVE_ALL) |
864 | { |
772 | { |
865 | while (inv) |
773 | while (inv) |
|
|
774 | { |
|
|
775 | inv->destroy_inv (drop_to_ground); |
866 | inv->destroy (); |
776 | inv->destroy (); |
|
|
777 | } |
867 | } |
778 | } |
868 | else |
779 | else |
869 | { /* Put objects in inventory onto this space */ |
780 | { /* Put objects in inventory onto this space */ |
870 | while (inv) |
781 | while (inv) |
871 | { |
782 | { |
… | |
… | |
876 | || op->type == RUNE |
787 | || op->type == RUNE |
877 | || op->type == TRAP |
788 | || op->type == TRAP |
878 | || op->flag [FLAG_IS_A_TEMPLATE]) |
789 | || op->flag [FLAG_IS_A_TEMPLATE]) |
879 | op->destroy (); |
790 | op->destroy (); |
880 | else |
791 | else |
881 | { |
792 | map->insert (op, x, y); |
882 | op->remove (); |
|
|
883 | op->x = x; |
|
|
884 | op->y = y; |
|
|
885 | insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ |
|
|
886 | } |
793 | } |
|
|
794 | } |
|
|
795 | } |
|
|
796 | |
|
|
797 | object *object::create () |
|
|
798 | { |
|
|
799 | object *op = new object; |
|
|
800 | op->link (); |
|
|
801 | return op; |
|
|
802 | } |
|
|
803 | |
|
|
804 | void |
|
|
805 | object::do_destroy () |
|
|
806 | { |
|
|
807 | if (flag [FLAG_IS_LINKED]) |
|
|
808 | remove_button_link (this); |
|
|
809 | |
|
|
810 | if (flag [FLAG_FRIENDLY]) |
|
|
811 | remove_friendly_object (this); |
|
|
812 | |
|
|
813 | if (!flag [FLAG_REMOVED]) |
|
|
814 | remove (); |
|
|
815 | |
|
|
816 | if (flag [FLAG_FREED]) |
|
|
817 | return; |
|
|
818 | |
|
|
819 | set_speed (0); |
|
|
820 | |
|
|
821 | flag [FLAG_FREED] = 1; |
|
|
822 | |
|
|
823 | attachable::do_destroy (); |
|
|
824 | |
|
|
825 | destroy_inv (true); |
|
|
826 | unlink (); |
|
|
827 | |
|
|
828 | // hack to ensure that freed objects still have a valid map |
|
|
829 | { |
|
|
830 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
|
|
831 | |
|
|
832 | if (!freed_map) |
|
|
833 | { |
|
|
834 | freed_map = new maptile; |
|
|
835 | |
|
|
836 | freed_map->name = "/internal/freed_objects_map"; |
|
|
837 | freed_map->width = 3; |
|
|
838 | freed_map->height = 3; |
|
|
839 | |
|
|
840 | freed_map->alloc (); |
|
|
841 | freed_map->in_memory = MAP_IN_MEMORY; |
887 | } |
842 | } |
|
|
843 | |
|
|
844 | map = freed_map; |
|
|
845 | x = 1; |
|
|
846 | y = 1; |
|
|
847 | } |
|
|
848 | |
|
|
849 | head = 0; |
|
|
850 | |
|
|
851 | if (more) |
888 | } |
852 | { |
|
|
853 | more->destroy (); |
|
|
854 | more = 0; |
|
|
855 | } |
|
|
856 | |
|
|
857 | // clear those pointers that likely might have circular references to us |
|
|
858 | owner = 0; |
|
|
859 | enemy = 0; |
|
|
860 | attacked_by = 0; |
889 | } |
861 | } |
890 | |
862 | |
891 | void |
863 | void |
892 | object::destroy (bool destroy_inventory) |
864 | object::destroy (bool destroy_inventory) |
893 | { |
865 | { |
894 | if (destroyed ()) |
866 | if (destroyed ()) |
895 | return; |
867 | return; |
896 | |
868 | |
897 | if (destroy_inventory) |
869 | if (destroy_inventory) |
898 | destroy_inv (true); |
870 | destroy_inv (false); |
899 | |
871 | |
900 | attachable::destroy (); |
872 | attachable::destroy (); |
901 | } |
873 | } |
902 | |
874 | |
903 | /* |
875 | /* |
… | |
… | |
956 | * to save cpu time. |
928 | * to save cpu time. |
957 | */ |
929 | */ |
958 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
930 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
959 | otmp->update_stats (); |
931 | otmp->update_stats (); |
960 | |
932 | |
961 | if (above != NULL) |
933 | if (above) |
962 | above->below = below; |
934 | above->below = below; |
963 | else |
935 | else |
964 | env->inv = below; |
936 | env->inv = below; |
965 | |
937 | |
966 | if (below != NULL) |
938 | if (below) |
967 | below->above = above; |
939 | below->above = above; |
968 | |
940 | |
969 | /* we set up values so that it could be inserted into |
941 | /* we set up values so that it could be inserted into |
970 | * the map, but we don't actually do that - it is up |
942 | * the map, but we don't actually do that - it is up |
971 | * to the caller to decide what we want to do. |
943 | * to the caller to decide what we want to do. |
… | |
… | |
975 | above = 0, below = 0; |
947 | above = 0, below = 0; |
976 | env = 0; |
948 | env = 0; |
977 | } |
949 | } |
978 | else if (map) |
950 | else if (map) |
979 | { |
951 | { |
980 | /* Re did the following section of code - it looks like it had |
952 | if (type == PLAYER) |
981 | * lots of logic for things we no longer care about |
|
|
982 | */ |
953 | { |
|
|
954 | --map->players; |
|
|
955 | map->touch (); |
|
|
956 | } |
|
|
957 | |
|
|
958 | map->dirty = true; |
983 | |
959 | |
984 | /* link the object above us */ |
960 | /* link the object above us */ |
985 | if (above) |
961 | if (above) |
986 | above->below = below; |
962 | above->below = below; |
987 | else |
963 | else |
… | |
… | |
1016 | if (map->in_memory == MAP_SAVING) |
992 | if (map->in_memory == MAP_SAVING) |
1017 | return; |
993 | return; |
1018 | |
994 | |
1019 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
995 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1020 | |
996 | |
1021 | for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) |
997 | for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) |
1022 | { |
998 | { |
1023 | /* No point updating the players look faces if he is the object |
999 | /* No point updating the players look faces if he is the object |
1024 | * being removed. |
1000 | * being removed. |
1025 | */ |
1001 | */ |
1026 | |
1002 | |
… | |
… | |
1038 | |
1014 | |
1039 | if (tmp->contr->ns) |
1015 | if (tmp->contr->ns) |
1040 | tmp->contr->ns->floorbox_update (); |
1016 | tmp->contr->ns->floorbox_update (); |
1041 | } |
1017 | } |
1042 | |
1018 | |
1043 | /* See if player moving off should effect something */ |
1019 | /* See if object moving off should effect something */ |
1044 | if (check_walk_off |
1020 | if (check_walk_off |
1045 | && ((move_type & tmp->move_off) |
1021 | && ((move_type & tmp->move_off) |
1046 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1022 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1047 | { |
1023 | { |
1048 | move_apply (tmp, this, 0); |
1024 | move_apply (tmp, this, 0); |
… | |
… | |
1050 | if (destroyed ()) |
1026 | if (destroyed ()) |
1051 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1027 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
1052 | } |
1028 | } |
1053 | |
1029 | |
1054 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1030 | /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ |
1055 | |
1031 | //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp) |
1056 | if (tmp->above == tmp) |
1032 | if (tmp->above == tmp) |
1057 | tmp->above = 0; |
1033 | tmp->above = 0; |
1058 | |
1034 | |
1059 | last = tmp; |
1035 | last = tmp; |
1060 | } |
1036 | } |
1061 | |
1037 | |
1062 | /* last == NULL of there are no objects on this space */ |
1038 | /* last == NULL if there are no objects on this space */ |
|
|
1039 | //TODO: this makes little sense, why only update the topmost object? |
1063 | if (!last) |
1040 | if (!last) |
1064 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1041 | map->at (x, y).flags_ = 0; |
1065 | else |
1042 | else |
1066 | update_object (last, UP_OBJ_REMOVE); |
1043 | update_object (last, UP_OBJ_REMOVE); |
1067 | |
1044 | |
1068 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1045 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1069 | update_all_los (map, x, y); |
1046 | update_all_los (map, x, y); |
… | |
… | |
1112 | * job preparing multi-part monsters |
1089 | * job preparing multi-part monsters |
1113 | */ |
1090 | */ |
1114 | object * |
1091 | object * |
1115 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1092 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1116 | { |
1093 | { |
1117 | object *tmp; |
|
|
1118 | |
|
|
1119 | if (op->head) |
|
|
1120 | op = op->head; |
|
|
1121 | |
|
|
1122 | for (tmp = op; tmp; tmp = tmp->more) |
1094 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1123 | { |
1095 | { |
1124 | tmp->x = x + tmp->arch->clone.x; |
1096 | tmp->x = x + tmp->arch->clone.x; |
1125 | tmp->y = y + tmp->arch->clone.y; |
1097 | tmp->y = y + tmp->arch->clone.y; |
1126 | } |
1098 | } |
1127 | |
1099 | |
… | |
… | |
1158 | { |
1130 | { |
1159 | LOG (llevError, "Trying to insert freed object!\n"); |
1131 | LOG (llevError, "Trying to insert freed object!\n"); |
1160 | return NULL; |
1132 | return NULL; |
1161 | } |
1133 | } |
1162 | |
1134 | |
1163 | if (m == NULL) |
1135 | if (!m) |
1164 | { |
1136 | { |
1165 | char *dump = dump_object (op); |
1137 | char *dump = dump_object (op); |
1166 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1138 | LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); |
1167 | free (dump); |
1139 | free (dump); |
1168 | return op; |
1140 | return op; |
… | |
… | |
1195 | { |
1167 | { |
1196 | /* The part may be on a different map. */ |
1168 | /* The part may be on a different map. */ |
1197 | |
1169 | |
1198 | object *more = op->more; |
1170 | object *more = op->more; |
1199 | |
1171 | |
1200 | /* We really need the caller to normalize coordinates - if |
1172 | /* We really need the caller to normalise coordinates - if |
1201 | * we set the map, that doesn't work if the location is within |
1173 | * we set the map, that doesn't work if the location is within |
1202 | * a map and this is straddling an edge. So only if coordinate |
1174 | * a map and this is straddling an edge. So only if coordinate |
1203 | * is clear wrong do we normalize it. |
1175 | * is clear wrong do we normalise it. |
1204 | */ |
1176 | */ |
1205 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1177 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1206 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1178 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1207 | else if (!more->map) |
1179 | else if (!more->map) |
1208 | { |
1180 | { |
… | |
… | |
1232 | y = op->y; |
1204 | y = op->y; |
1233 | |
1205 | |
1234 | /* this has to be done after we translate the coordinates. |
1206 | /* this has to be done after we translate the coordinates. |
1235 | */ |
1207 | */ |
1236 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1208 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1237 | for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) |
1209 | for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) |
1238 | if (object::can_merge (op, tmp)) |
1210 | if (object::can_merge (op, tmp)) |
1239 | { |
1211 | { |
1240 | op->nrof += tmp->nrof; |
1212 | op->nrof += tmp->nrof; |
1241 | tmp->destroy (); |
1213 | tmp->destroy (); |
1242 | } |
1214 | } |
… | |
… | |
1269 | else |
1241 | else |
1270 | { |
1242 | { |
1271 | /* If there are other objects, then */ |
1243 | /* If there are other objects, then */ |
1272 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1244 | if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) |
1273 | { |
1245 | { |
1274 | object *last = NULL; |
1246 | object *last = 0; |
1275 | |
1247 | |
1276 | /* |
1248 | /* |
1277 | * If there are multiple objects on this space, we do some trickier handling. |
1249 | * If there are multiple objects on this space, we do some trickier handling. |
1278 | * We've already dealt with merging if appropriate. |
1250 | * We've already dealt with merging if appropriate. |
1279 | * Generally, we want to put the new object on top. But if |
1251 | * Generally, we want to put the new object on top. But if |
… | |
… | |
1283 | * once we get to them. This reduces the need to traverse over all of |
1255 | * once we get to them. This reduces the need to traverse over all of |
1284 | * them when adding another one - this saves quite a bit of cpu time |
1256 | * them when adding another one - this saves quite a bit of cpu time |
1285 | * when lots of spells are cast in one area. Currently, it is presumed |
1257 | * when lots of spells are cast in one area. Currently, it is presumed |
1286 | * that flying non pickable objects are spell objects. |
1258 | * that flying non pickable objects are spell objects. |
1287 | */ |
1259 | */ |
1288 | |
|
|
1289 | while (top != NULL) |
1260 | while (top) |
1290 | { |
1261 | { |
1291 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1262 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1292 | floor = top; |
1263 | floor = top; |
1293 | |
1264 | |
1294 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1265 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
… | |
… | |
1347 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1318 | op->above = GET_MAP_OB (op->map, op->x, op->y); |
1348 | |
1319 | |
1349 | if (op->above) |
1320 | if (op->above) |
1350 | op->above->below = op; |
1321 | op->above->below = op; |
1351 | |
1322 | |
1352 | op->below = NULL; |
1323 | op->below = 0; |
1353 | op->ms ().bot = op; |
1324 | op->ms ().bot = op; |
1354 | } |
1325 | } |
1355 | else |
1326 | else |
1356 | { /* get inserted into the stack above top */ |
1327 | { /* get inserted into the stack above top */ |
1357 | op->above = top->above; |
1328 | op->above = top->above; |
… | |
… | |
1361 | |
1332 | |
1362 | op->below = top; |
1333 | op->below = top; |
1363 | top->above = op; |
1334 | top->above = op; |
1364 | } |
1335 | } |
1365 | |
1336 | |
1366 | if (op->above == NULL) |
1337 | if (!op->above) |
1367 | op->ms ().top = op; |
1338 | op->ms ().top = op; |
1368 | } /* else not INS_BELOW_ORIGINATOR */ |
1339 | } /* else not INS_BELOW_ORIGINATOR */ |
1369 | |
1340 | |
1370 | if (op->type == PLAYER) |
1341 | if (op->type == PLAYER) |
|
|
1342 | { |
1371 | op->contr->do_los = 1; |
1343 | op->contr->do_los = 1; |
|
|
1344 | ++op->map->players; |
|
|
1345 | op->map->touch (); |
|
|
1346 | } |
|
|
1347 | |
|
|
1348 | op->map->dirty = true; |
1372 | |
1349 | |
1373 | /* If we have a floor, we know the player, if any, will be above |
1350 | /* If we have a floor, we know the player, if any, will be above |
1374 | * it, so save a few ticks and start from there. |
1351 | * it, so save a few ticks and start from there. |
1375 | */ |
1352 | */ |
1376 | if (!(flag & INS_MAP_LOAD)) |
1353 | if (!(flag & INS_MAP_LOAD)) |
… | |
… | |
1382 | * visible to others on this map. But update_all_los is really |
1359 | * visible to others on this map. But update_all_los is really |
1383 | * an inefficient way to do this, as it means los for all players |
1360 | * an inefficient way to do this, as it means los for all players |
1384 | * on the map will get recalculated. The players could very well |
1361 | * on the map will get recalculated. The players could very well |
1385 | * be far away from this change and not affected in any way - |
1362 | * be far away from this change and not affected in any way - |
1386 | * this should get redone to only look for players within range, |
1363 | * this should get redone to only look for players within range, |
1387 | * or just updating the P_NEED_UPDATE for spaces within this area |
1364 | * or just updating the P_UPTODATE for spaces within this area |
1388 | * of effect may be sufficient. |
1365 | * of effect may be sufficient. |
1389 | */ |
1366 | */ |
1390 | if (op->map->darkness && (op->glow_radius != 0)) |
1367 | if (op->map->darkness && (op->glow_radius != 0)) |
1391 | update_all_los (op->map, op->x, op->y); |
1368 | update_all_los (op->map, op->x, op->y); |
1392 | |
1369 | |
… | |
… | |
1430 | { |
1407 | { |
1431 | object *tmp, *tmp1; |
1408 | object *tmp, *tmp1; |
1432 | |
1409 | |
1433 | /* first search for itself and remove any old instances */ |
1410 | /* first search for itself and remove any old instances */ |
1434 | |
1411 | |
1435 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1412 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1436 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1413 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1437 | tmp->destroy (); |
1414 | tmp->destroy (); |
1438 | |
1415 | |
1439 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1416 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1440 | |
1417 | |
1441 | tmp1->x = op->x; |
1418 | tmp1->x = op->x; |
1442 | tmp1->y = op->y; |
1419 | tmp1->y = op->y; |
1443 | insert_ob_in_map (tmp1, op->map, op, 0); |
1420 | insert_ob_in_map (tmp1, op->map, op, 0); |
|
|
1421 | } |
|
|
1422 | |
|
|
1423 | object * |
|
|
1424 | object::insert_at (object *where, object *originator, int flags) |
|
|
1425 | { |
|
|
1426 | where->map->insert (this, where->x, where->y, originator, flags); |
1444 | } |
1427 | } |
1445 | |
1428 | |
1446 | /* |
1429 | /* |
1447 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1430 | * get_split_ob(ob,nr) splits up ob into two parts. The part which |
1448 | * is returned contains nr objects, and the remaining parts contains |
1431 | * is returned contains nr objects, and the remaining parts contains |
1449 | * the rest (or is removed and freed if that number is 0). |
1432 | * the rest (or is removed and freed if that number is 0). |
1450 | * On failure, NULL is returned, and the reason put into the |
1433 | * On failure, NULL is returned, and the reason put into the |
1451 | * global static errmsg array. |
1434 | * global static errmsg array. |
1452 | */ |
1435 | */ |
1453 | |
|
|
1454 | object * |
1436 | object * |
1455 | get_split_ob (object *orig_ob, uint32 nr) |
1437 | get_split_ob (object *orig_ob, uint32 nr) |
1456 | { |
1438 | { |
1457 | object *newob; |
1439 | object *newob; |
1458 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
1440 | int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); |
… | |
… | |
1722 | * |
1704 | * |
1723 | * MSW 2001-07-08: Check all objects on space, not just those below |
1705 | * MSW 2001-07-08: Check all objects on space, not just those below |
1724 | * object being inserted. insert_ob_in_map may not put new objects |
1706 | * object being inserted. insert_ob_in_map may not put new objects |
1725 | * on top. |
1707 | * on top. |
1726 | */ |
1708 | */ |
1727 | |
|
|
1728 | int |
1709 | int |
1729 | check_move_on (object *op, object *originator) |
1710 | check_move_on (object *op, object *originator) |
1730 | { |
1711 | { |
1731 | object *tmp; |
1712 | object *tmp; |
1732 | maptile *m = op->map; |
1713 | maptile *m = op->map; |
… | |
… | |
1759 | |
1740 | |
1760 | /* The objects have to be checked from top to bottom. |
1741 | /* The objects have to be checked from top to bottom. |
1761 | * Hence, we first go to the top: |
1742 | * Hence, we first go to the top: |
1762 | */ |
1743 | */ |
1763 | |
1744 | |
1764 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1745 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
1765 | { |
1746 | { |
1766 | /* Trim the search when we find the first other spell effect |
1747 | /* Trim the search when we find the first other spell effect |
1767 | * this helps performance so that if a space has 50 spell objects, |
1748 | * this helps performance so that if a space has 50 spell objects, |
1768 | * we don't need to check all of them. |
1749 | * we don't need to check all of them. |
1769 | */ |
1750 | */ |
… | |
… | |
1827 | * The first matching object is returned, or NULL if none. |
1808 | * The first matching object is returned, or NULL if none. |
1828 | */ |
1809 | */ |
1829 | object * |
1810 | object * |
1830 | present_arch (const archetype *at, maptile *m, int x, int y) |
1811 | present_arch (const archetype *at, maptile *m, int x, int y) |
1831 | { |
1812 | { |
1832 | if (m == NULL || out_of_map (m, x, y)) |
1813 | if (!m || out_of_map (m, x, y)) |
1833 | { |
1814 | { |
1834 | LOG (llevError, "Present_arch called outside map.\n"); |
1815 | LOG (llevError, "Present_arch called outside map.\n"); |
1835 | return NULL; |
1816 | return NULL; |
1836 | } |
1817 | } |
1837 | |
1818 | |
1838 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1819 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1839 | if (tmp->arch == at) |
1820 | if (tmp->arch == at) |
1840 | return tmp; |
1821 | return tmp; |
1841 | |
1822 | |
1842 | return NULL; |
1823 | return NULL; |
1843 | } |
1824 | } |
… | |
… | |
1854 | { |
1835 | { |
1855 | LOG (llevError, "Present called outside map.\n"); |
1836 | LOG (llevError, "Present called outside map.\n"); |
1856 | return NULL; |
1837 | return NULL; |
1857 | } |
1838 | } |
1858 | |
1839 | |
1859 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1840 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1860 | if (tmp->type == type) |
1841 | if (tmp->type == type) |
1861 | return tmp; |
1842 | return tmp; |
1862 | |
1843 | |
1863 | return NULL; |
1844 | return NULL; |
1864 | } |
1845 | } |
… | |
… | |
2589 | } |
2570 | } |
2590 | else |
2571 | else |
2591 | item = item->env; |
2572 | item = item->env; |
2592 | } |
2573 | } |
2593 | |
2574 | |
|
|
2575 | |
|
|
2576 | const char * |
|
|
2577 | object::flag_desc (char *desc, int len) const |
|
|
2578 | { |
|
|
2579 | char *p = desc; |
|
|
2580 | bool first = true; |
|
|
2581 | |
|
|
2582 | *p = 0; |
|
|
2583 | |
|
|
2584 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
2585 | { |
|
|
2586 | if (len <= 10) // magic constant! |
|
|
2587 | { |
|
|
2588 | snprintf (p, len, ",..."); |
|
|
2589 | break; |
|
|
2590 | } |
|
|
2591 | |
|
|
2592 | if (flag [i]) |
|
|
2593 | { |
|
|
2594 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
|
|
2595 | len -= cnt; |
|
|
2596 | p += cnt; |
|
|
2597 | first = false; |
|
|
2598 | } |
|
|
2599 | } |
|
|
2600 | |
|
|
2601 | return desc; |
|
|
2602 | } |
|
|
2603 | |
2594 | // return a suitable string describing an objetc in enough detail to find it |
2604 | // return a suitable string describing an object in enough detail to find it |
2595 | const char * |
2605 | const char * |
2596 | object::debug_desc (char *info) const |
2606 | object::debug_desc (char *info) const |
2597 | { |
2607 | { |
|
|
2608 | char flagdesc[512]; |
2598 | char info2[256 * 3]; |
2609 | char info2[256 * 4]; |
2599 | char *p = info; |
2610 | char *p = info; |
2600 | |
2611 | |
2601 | p += snprintf (p, 256, "%d=\"%s%s%s\"", |
2612 | p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", |
2602 | count, |
2613 | count, uuid.seq, |
2603 | &name, |
2614 | &name, |
2604 | title ? " " : "", |
2615 | title ? "\",title:" : "", |
2605 | title ? (const char *)title : ""); |
2616 | title ? (const char *)title : "", |
|
|
2617 | flag_desc (flagdesc, 512), type); |
2606 | |
2618 | |
2607 | if (env) |
2619 | if (env) |
2608 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2620 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2609 | |
2621 | |
2610 | if (map) |
2622 | if (map) |
2611 | p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); |
2623 | p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); |
2612 | |
2624 | |
2613 | return info; |
2625 | return info; |
2614 | } |
2626 | } |
2615 | |
2627 | |
2616 | const char * |
2628 | const char * |
2617 | object::debug_desc () const |
2629 | object::debug_desc () const |
2618 | { |
2630 | { |
2619 | static char info[256 * 3]; |
2631 | static char info[256 * 4]; |
2620 | return debug_desc (info); |
2632 | return debug_desc (info); |
2621 | } |
2633 | } |
2622 | |
2634 | |