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, |
… | |
… | |
390 | } |
392 | } |
391 | |
393 | |
392 | /* |
394 | /* |
393 | * 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. |
394 | */ |
396 | */ |
395 | |
|
|
396 | object * |
397 | object * |
397 | find_object (tag_t i) |
398 | find_object (tag_t i) |
398 | { |
399 | { |
399 | for (object *op = object::first; op; op = op->next) |
400 | for_all_objects (op) |
400 | if (op->count == i) |
401 | if (op->count == i) |
401 | return op; |
402 | return op; |
402 | |
403 | |
403 | return 0; |
404 | return 0; |
404 | } |
405 | } |
405 | |
406 | |
406 | /* |
407 | /* |
407 | * Returns the first object which has a name equal to the argument. |
408 | * Returns the first object which has a name equal to the argument. |
408 | * Used only by the patch command, but not all that useful. |
409 | * Used only by the patch command, but not all that useful. |
409 | * Enables features like "patch <name-of-other-player> food 999" |
410 | * Enables features like "patch <name-of-other-player> food 999" |
410 | */ |
411 | */ |
411 | |
|
|
412 | object * |
412 | object * |
413 | find_object_name (const char *str) |
413 | find_object_name (const char *str) |
414 | { |
414 | { |
415 | shstr_cmp str_ (str); |
415 | shstr_cmp str_ (str); |
416 | object *op; |
416 | object *op; |
417 | |
417 | |
418 | for (op = object::first; op != NULL; op = op->next) |
418 | for_all_objects (op) |
419 | if (op->name == str_) |
419 | if (op->name == str_) |
420 | break; |
420 | break; |
421 | |
421 | |
422 | return op; |
422 | return op; |
423 | } |
423 | } |
… | |
… | |
564 | } |
564 | } |
565 | |
565 | |
566 | this->speed = speed; |
566 | this->speed = speed; |
567 | |
567 | |
568 | if (has_active_speed ()) |
568 | if (has_active_speed ()) |
569 | activate (false); |
569 | activate (); |
570 | else |
570 | else |
571 | deactivate (false); |
571 | deactivate (); |
572 | } |
572 | } |
573 | |
573 | |
574 | /* |
574 | /* |
575 | * update_object() updates the the map. |
575 | * update_object() updates the the map. |
576 | * It takes into account invisible objects (and represent squares covered |
576 | * It takes into account invisible objects (and represent squares covered |
… | |
… | |
624 | return; |
624 | return; |
625 | } |
625 | } |
626 | |
626 | |
627 | mapspace &m = op->ms (); |
627 | mapspace &m = op->ms (); |
628 | |
628 | |
629 | if (m.flags_ & P_NEED_UPDATE) |
629 | if (!(m.flags_ & P_UPTODATE)) |
630 | /* nop */; |
630 | /* nop */; |
631 | else if (action == UP_OBJ_INSERT) |
631 | else if (action == UP_OBJ_INSERT) |
632 | { |
632 | { |
633 | // this is likely overkill, TODO: revisit (schmorp) |
633 | // this is likely overkill, TODO: revisit (schmorp) |
634 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
634 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
… | |
… | |
643 | /* 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 |
644 | * to have move_allow right now. |
644 | * to have move_allow right now. |
645 | */ |
645 | */ |
646 | || ((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 |
647 | || 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) |
648 | m.flags_ = P_NEED_UPDATE; |
648 | m.flags_ = 0; |
649 | } |
649 | } |
650 | /* if the object is being removed, we can't make intelligent |
650 | /* if the object is being removed, we can't make intelligent |
651 | * decisions, because remove_ob can't really pass the object |
651 | * decisions, because remove_ob can't really pass the object |
652 | * that is being removed. |
652 | * that is being removed. |
653 | */ |
653 | */ |
654 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
654 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
655 | m.flags_ = P_NEED_UPDATE; |
655 | m.flags_ = 0; |
656 | else if (action == UP_OBJ_FACE) |
656 | else if (action == UP_OBJ_FACE) |
657 | /* Nothing to do for that case */ ; |
657 | /* Nothing to do for that case */ ; |
658 | else |
658 | else |
659 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
659 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
660 | |
660 | |
661 | if (op->more) |
661 | if (op->more) |
662 | update_object (op->more, action); |
662 | update_object (op->more, action); |
663 | } |
663 | } |
664 | |
664 | |
665 | object::vector object::objects; // not yet used |
|
|
666 | object *object::first; |
|
|
667 | |
|
|
668 | object::object () |
665 | object::object () |
669 | { |
666 | { |
670 | SET_FLAG (this, FLAG_REMOVED); |
667 | SET_FLAG (this, FLAG_REMOVED); |
671 | |
668 | |
672 | expmul = 1.0; |
669 | expmul = 1.0; |
… | |
… | |
676 | object::~object () |
673 | object::~object () |
677 | { |
674 | { |
678 | free_key_values (this); |
675 | free_key_values (this); |
679 | } |
676 | } |
680 | |
677 | |
|
|
678 | static int object_count; |
|
|
679 | |
681 | void object::link () |
680 | void object::link () |
682 | { |
681 | { |
683 | count = ++ob_count; |
682 | assert (!index);//D |
684 | uuid = gen_uuid (); |
683 | uuid = gen_uuid (); |
|
|
684 | count = ++object_count; |
685 | |
685 | |
686 | prev = 0; |
686 | refcnt_inc (); |
687 | next = object::first; |
687 | objects.insert (this); |
688 | |
|
|
689 | if (object::first) |
|
|
690 | object::first->prev = this; |
|
|
691 | |
|
|
692 | object::first = this; |
|
|
693 | } |
688 | } |
694 | |
689 | |
695 | void object::unlink () |
690 | void object::unlink () |
696 | { |
691 | { |
697 | if (this == object::first) |
692 | assert (index);//D |
698 | object::first = next; |
693 | objects.erase (this); |
699 | |
694 | refcnt_dec (); |
700 | /* Remove this object from the list of used objects */ |
|
|
701 | if (prev) prev->next = next; |
|
|
702 | if (next) next->prev = prev; |
|
|
703 | |
|
|
704 | prev = 0; |
|
|
705 | next = 0; |
|
|
706 | } |
695 | } |
707 | |
696 | |
708 | void |
697 | void |
709 | object::activate (bool recursive) |
698 | object::activate () |
710 | { |
699 | { |
|
|
700 | /* If already on active list, don't do anything */ |
|
|
701 | if (active) |
|
|
702 | return; |
|
|
703 | |
711 | if (has_active_speed ()) |
704 | if (has_active_speed ()) |
712 | { |
705 | actives.insert (this); |
713 | /* If already on active list, don't do anything */ |
706 | } |
714 | if (active_next || active_prev || this == active_objects) |
|
|
715 | return; |
|
|
716 | |
707 | |
717 | /* process_events() expects us to insert the object at the beginning |
708 | void |
718 | * of the list. */ |
709 | object::activate_recursive () |
719 | active_next = active_objects; |
710 | { |
|
|
711 | activate (); |
720 | |
712 | |
721 | if (active_next) |
|
|
722 | active_next->active_prev = this; |
|
|
723 | |
|
|
724 | active_objects = this; |
|
|
725 | } |
|
|
726 | |
|
|
727 | if (recursive) |
|
|
728 | for (object *op = inv; op; op = op->above) |
713 | for (object *op = inv; op; op = op->below) |
729 | op->activate (1); |
714 | op->activate_recursive (); |
730 | } |
715 | } |
731 | |
716 | |
732 | /* This function removes object 'op' from the list of active |
717 | /* This function removes object 'op' from the list of active |
733 | * objects. |
718 | * objects. |
734 | * This should only be used for style maps or other such |
719 | * This should only be used for style maps or other such |
… | |
… | |
736 | * in play chewing up cpu time getting processed. |
721 | * in play chewing up cpu time getting processed. |
737 | * The reverse of this is to call update_ob_speed, which |
722 | * The reverse of this is to call update_ob_speed, which |
738 | * will do the right thing based on the speed of the object. |
723 | * will do the right thing based on the speed of the object. |
739 | */ |
724 | */ |
740 | void |
725 | void |
741 | object::deactivate (bool recursive) |
726 | object::deactivate () |
742 | { |
727 | { |
743 | /* If not on the active list, nothing needs to be done */ |
728 | /* If not on the active list, nothing needs to be done */ |
744 | if (!active_next && !active_prev && this != active_objects) |
729 | if (!active) |
745 | return; |
730 | return; |
746 | |
731 | |
747 | if (active_prev == 0) |
732 | actives.erase (this); |
748 | { |
733 | } |
749 | active_objects = active_next; |
|
|
750 | if (active_next) |
|
|
751 | active_next->active_prev = 0; |
|
|
752 | } |
|
|
753 | else |
|
|
754 | { |
|
|
755 | active_prev->active_next = active_next; |
|
|
756 | if (active_next) |
|
|
757 | active_next->active_prev = active_prev; |
|
|
758 | } |
|
|
759 | |
734 | |
760 | active_next = 0; |
735 | void |
761 | active_prev = 0; |
736 | object::deactivate_recursive () |
762 | |
737 | { |
763 | if (recursive) |
|
|
764 | for (object *op = inv; op; op = op->above) |
738 | for (object *op = inv; op; op = op->below) |
|
|
739 | op->deactivate_recursive (); |
|
|
740 | |
765 | op->deactivate (1); |
741 | deactivate (); |
|
|
742 | } |
|
|
743 | |
|
|
744 | void |
|
|
745 | object::set_flag_inv (int flag, int value) |
|
|
746 | { |
|
|
747 | for (object *op = inv; op; op = op->below) |
|
|
748 | { |
|
|
749 | op->flag [flag] = value; |
|
|
750 | op->set_flag_inv (flag, value); |
|
|
751 | } |
766 | } |
752 | } |
767 | |
753 | |
768 | /* |
754 | /* |
769 | * Remove and free all objects in the inventory of the given object. |
755 | * Remove and free all objects in the inventory of the given object. |
770 | * object.c ? |
756 | * object.c ? |
… | |
… | |
803 | |
789 | |
804 | if (op->flag [FLAG_STARTEQUIP] |
790 | if (op->flag [FLAG_STARTEQUIP] |
805 | || op->flag [FLAG_NO_DROP] |
791 | || op->flag [FLAG_NO_DROP] |
806 | || op->type == RUNE |
792 | || op->type == RUNE |
807 | || op->type == TRAP |
793 | || op->type == TRAP |
808 | || op->flag [FLAG_IS_A_TEMPLATE]) |
794 | || op->flag [FLAG_IS_A_TEMPLATE] |
|
|
795 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
809 | op->destroy (); |
796 | op->destroy (); |
810 | else |
797 | else |
811 | map->insert (op, x, y); |
798 | map->insert (op, x, y); |
812 | } |
799 | } |
813 | } |
800 | } |
… | |
… | |
821 | } |
808 | } |
822 | |
809 | |
823 | void |
810 | void |
824 | object::do_destroy () |
811 | object::do_destroy () |
825 | { |
812 | { |
|
|
813 | attachable::do_destroy (); |
|
|
814 | |
826 | if (flag [FLAG_IS_LINKED]) |
815 | if (flag [FLAG_IS_LINKED]) |
827 | remove_button_link (this); |
816 | remove_button_link (this); |
828 | |
817 | |
829 | if (flag [FLAG_FRIENDLY]) |
818 | if (flag [FLAG_FRIENDLY]) |
830 | remove_friendly_object (this); |
819 | remove_friendly_object (this); |
831 | |
820 | |
832 | if (!flag [FLAG_REMOVED]) |
821 | if (!flag [FLAG_REMOVED]) |
833 | remove (); |
822 | remove (); |
834 | |
823 | |
835 | if (flag [FLAG_FREED]) |
824 | destroy_inv (true); |
836 | return; |
|
|
837 | |
825 | |
838 | set_speed (0); |
826 | deactivate (); |
|
|
827 | unlink (); |
839 | |
828 | |
840 | flag [FLAG_FREED] = 1; |
829 | flag [FLAG_FREED] = 1; |
841 | |
|
|
842 | attachable::do_destroy (); |
|
|
843 | |
|
|
844 | destroy_inv (true); |
|
|
845 | unlink (); |
|
|
846 | |
830 | |
847 | // hack to ensure that freed objects still have a valid map |
831 | // hack to ensure that freed objects still have a valid map |
848 | { |
832 | { |
849 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
833 | static maptile *freed_map; // freed objects are moved here to avoid crashes |
850 | |
834 | |
… | |
… | |
855 | freed_map->name = "/internal/freed_objects_map"; |
839 | freed_map->name = "/internal/freed_objects_map"; |
856 | freed_map->width = 3; |
840 | freed_map->width = 3; |
857 | freed_map->height = 3; |
841 | freed_map->height = 3; |
858 | |
842 | |
859 | freed_map->alloc (); |
843 | freed_map->alloc (); |
|
|
844 | freed_map->in_memory = MAP_IN_MEMORY; |
860 | } |
845 | } |
861 | |
846 | |
862 | map = freed_map; |
847 | map = freed_map; |
863 | x = 1; |
848 | x = 1; |
864 | y = 1; |
849 | y = 1; |
… | |
… | |
874 | |
859 | |
875 | // clear those pointers that likely might have circular references to us |
860 | // clear those pointers that likely might have circular references to us |
876 | owner = 0; |
861 | owner = 0; |
877 | enemy = 0; |
862 | enemy = 0; |
878 | attacked_by = 0; |
863 | attacked_by = 0; |
879 | |
|
|
880 | // only relevant for players(?), but make sure of it anyways |
|
|
881 | contr = 0; |
|
|
882 | } |
864 | } |
883 | |
865 | |
884 | void |
866 | void |
885 | object::destroy (bool destroy_inventory) |
867 | object::destroy (bool destroy_inventory) |
886 | { |
868 | { |
… | |
… | |
971 | else if (map) |
953 | else if (map) |
972 | { |
954 | { |
973 | if (type == PLAYER) |
955 | if (type == PLAYER) |
974 | { |
956 | { |
975 | --map->players; |
957 | --map->players; |
976 | map->last_access = runtime; |
958 | map->touch (); |
977 | } |
959 | } |
978 | |
960 | |
|
|
961 | map->dirty = true; |
979 | |
962 | |
980 | /* link the object above us */ |
963 | /* link the object above us */ |
981 | if (above) |
964 | if (above) |
982 | above->below = below; |
965 | above->below = below; |
983 | else |
966 | else |
… | |
… | |
1056 | } |
1039 | } |
1057 | |
1040 | |
1058 | /* last == NULL if there are no objects on this space */ |
1041 | /* last == NULL if there are no objects on this space */ |
1059 | //TODO: this makes little sense, why only update the topmost object? |
1042 | //TODO: this makes little sense, why only update the topmost object? |
1060 | if (!last) |
1043 | if (!last) |
1061 | map->at (x, y).flags_ = P_NEED_UPDATE; |
1044 | map->at (x, y).flags_ = 0; |
1062 | else |
1045 | else |
1063 | update_object (last, UP_OBJ_REMOVE); |
1046 | update_object (last, UP_OBJ_REMOVE); |
1064 | |
1047 | |
1065 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1048 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1066 | update_all_los (map, x, y); |
1049 | update_all_los (map, x, y); |
… | |
… | |
1187 | { |
1170 | { |
1188 | /* The part may be on a different map. */ |
1171 | /* The part may be on a different map. */ |
1189 | |
1172 | |
1190 | object *more = op->more; |
1173 | object *more = op->more; |
1191 | |
1174 | |
1192 | /* We really need the caller to normalize coordinates - if |
1175 | /* We really need the caller to normalise coordinates - if |
1193 | * we set the map, that doesn't work if the location is within |
1176 | * we set the map, that doesn't work if the location is within |
1194 | * a map and this is straddling an edge. So only if coordinate |
1177 | * a map and this is straddling an edge. So only if coordinate |
1195 | * is clear wrong do we normalize it. |
1178 | * is clear wrong do we normalise it. |
1196 | */ |
1179 | */ |
1197 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1180 | if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) |
1198 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1181 | more->map = get_map_from_coord (m, &more->x, &more->y); |
1199 | else if (!more->map) |
1182 | else if (!more->map) |
1200 | { |
1183 | { |
… | |
… | |
1360 | |
1343 | |
1361 | if (op->type == PLAYER) |
1344 | if (op->type == PLAYER) |
1362 | { |
1345 | { |
1363 | op->contr->do_los = 1; |
1346 | op->contr->do_los = 1; |
1364 | ++op->map->players; |
1347 | ++op->map->players; |
1365 | op->map->last_access = runtime; |
1348 | op->map->touch (); |
1366 | } |
1349 | } |
|
|
1350 | |
|
|
1351 | op->map->dirty = true; |
1367 | |
1352 | |
1368 | /* If we have a floor, we know the player, if any, will be above |
1353 | /* If we have a floor, we know the player, if any, will be above |
1369 | * it, so save a few ticks and start from there. |
1354 | * it, so save a few ticks and start from there. |
1370 | */ |
1355 | */ |
1371 | if (!(flag & INS_MAP_LOAD)) |
1356 | if (!(flag & INS_MAP_LOAD)) |
… | |
… | |
1377 | * visible to others on this map. But update_all_los is really |
1362 | * visible to others on this map. But update_all_los is really |
1378 | * an inefficient way to do this, as it means los for all players |
1363 | * an inefficient way to do this, as it means los for all players |
1379 | * on the map will get recalculated. The players could very well |
1364 | * on the map will get recalculated. The players could very well |
1380 | * be far away from this change and not affected in any way - |
1365 | * be far away from this change and not affected in any way - |
1381 | * this should get redone to only look for players within range, |
1366 | * this should get redone to only look for players within range, |
1382 | * or just updating the P_NEED_UPDATE for spaces within this area |
1367 | * or just updating the P_UPTODATE for spaces within this area |
1383 | * of effect may be sufficient. |
1368 | * of effect may be sufficient. |
1384 | */ |
1369 | */ |
1385 | if (op->map->darkness && (op->glow_radius != 0)) |
1370 | if (op->map->darkness && (op->glow_radius != 0)) |
1386 | update_all_los (op->map, op->x, op->y); |
1371 | update_all_los (op->map, op->x, op->y); |
1387 | |
1372 | |
… | |
… | |
1425 | { |
1410 | { |
1426 | object *tmp, *tmp1; |
1411 | object *tmp, *tmp1; |
1427 | |
1412 | |
1428 | /* first search for itself and remove any old instances */ |
1413 | /* first search for itself and remove any old instances */ |
1429 | |
1414 | |
1430 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
1415 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1431 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1416 | if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ |
1432 | tmp->destroy (); |
1417 | tmp->destroy (); |
1433 | |
1418 | |
1434 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1419 | tmp1 = arch_to_object (archetype::find (arch_string)); |
1435 | |
1420 | |
… | |
… | |
1758 | |
1743 | |
1759 | /* The objects have to be checked from top to bottom. |
1744 | /* The objects have to be checked from top to bottom. |
1760 | * Hence, we first go to the top: |
1745 | * Hence, we first go to the top: |
1761 | */ |
1746 | */ |
1762 | |
1747 | |
1763 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) |
1748 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
1764 | { |
1749 | { |
1765 | /* Trim the search when we find the first other spell effect |
1750 | /* Trim the search when we find the first other spell effect |
1766 | * this helps performance so that if a space has 50 spell objects, |
1751 | * this helps performance so that if a space has 50 spell objects, |
1767 | * we don't need to check all of them. |
1752 | * we don't need to check all of them. |
1768 | */ |
1753 | */ |
… | |
… | |
1826 | * The first matching object is returned, or NULL if none. |
1811 | * The first matching object is returned, or NULL if none. |
1827 | */ |
1812 | */ |
1828 | object * |
1813 | object * |
1829 | present_arch (const archetype *at, maptile *m, int x, int y) |
1814 | present_arch (const archetype *at, maptile *m, int x, int y) |
1830 | { |
1815 | { |
1831 | if (m == NULL || out_of_map (m, x, y)) |
1816 | if (!m || out_of_map (m, x, y)) |
1832 | { |
1817 | { |
1833 | LOG (llevError, "Present_arch called outside map.\n"); |
1818 | LOG (llevError, "Present_arch called outside map.\n"); |
1834 | return NULL; |
1819 | return NULL; |
1835 | } |
1820 | } |
1836 | |
1821 | |
1837 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1822 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1838 | if (tmp->arch == at) |
1823 | if (tmp->arch == at) |
1839 | return tmp; |
1824 | return tmp; |
1840 | |
1825 | |
1841 | return NULL; |
1826 | return NULL; |
1842 | } |
1827 | } |
… | |
… | |
1853 | { |
1838 | { |
1854 | LOG (llevError, "Present called outside map.\n"); |
1839 | LOG (llevError, "Present called outside map.\n"); |
1855 | return NULL; |
1840 | return NULL; |
1856 | } |
1841 | } |
1857 | |
1842 | |
1858 | for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
1843 | for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) |
1859 | if (tmp->type == type) |
1844 | if (tmp->type == type) |
1860 | return tmp; |
1845 | return tmp; |
1861 | |
1846 | |
1862 | return NULL; |
1847 | return NULL; |
1863 | } |
1848 | } |
… | |
… | |
2595 | object::flag_desc (char *desc, int len) const |
2580 | object::flag_desc (char *desc, int len) const |
2596 | { |
2581 | { |
2597 | char *p = desc; |
2582 | char *p = desc; |
2598 | bool first = true; |
2583 | bool first = true; |
2599 | |
2584 | |
|
|
2585 | *p = 0; |
|
|
2586 | |
2600 | for (int i = 0; i < NUM_FLAGS; i++) |
2587 | for (int i = 0; i < NUM_FLAGS; i++) |
2601 | { |
2588 | { |
2602 | if (len <= 10) // magic constant! |
2589 | if (len <= 10) // magic constant! |
2603 | { |
2590 | { |
2604 | snprintf (p, len, ",..."); |
2591 | snprintf (p, len, ",..."); |
2605 | break; |
2592 | break; |
2606 | } |
2593 | } |
2607 | |
2594 | |
2608 | if (flag[i]) |
2595 | if (flag [i]) |
2609 | { |
2596 | { |
2610 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
2597 | int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); |
2611 | len -= cnt; |
2598 | len -= cnt; |
2612 | p += cnt; |
2599 | p += cnt; |
2613 | first = false; |
2600 | first = false; |
… | |
… | |
2615 | } |
2602 | } |
2616 | |
2603 | |
2617 | return desc; |
2604 | return desc; |
2618 | } |
2605 | } |
2619 | |
2606 | |
2620 | // return a suitable string describing an objetc in enough detail to find it |
2607 | // return a suitable string describing an object in enough detail to find it |
2621 | const char * |
2608 | const char * |
2622 | object::debug_desc (char *info) const |
2609 | object::debug_desc (char *info) const |
2623 | { |
2610 | { |
2624 | char flagdesc[512]; |
2611 | char flagdesc[512]; |
2625 | char info2[256 * 4]; |
2612 | char info2[256 * 4]; |
… | |
… | |
2642 | } |
2629 | } |
2643 | |
2630 | |
2644 | const char * |
2631 | const char * |
2645 | object::debug_desc () const |
2632 | object::debug_desc () const |
2646 | { |
2633 | { |
2647 | static char info[256 * 3]; |
2634 | static char info[256 * 4]; |
2648 | return debug_desc (info); |
2635 | return debug_desc (info); |
2649 | } |
2636 | } |
2650 | |
2637 | |