ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.97 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
… …
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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, 45short 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};
46short 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, 48short 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
396object * 397object *
397find_object (tag_t i) 398find_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
412object * 412object *
413find_object_name (const char *str) 413find_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}
… …
489 489
490 if (is_removed) 490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
492 492
493 if (speed < 0) 493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
495 495
496 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
497 if (key_values) 497 if (key_values)
498 { 498 {
499 key_value *tail = 0; 499 key_value *tail = 0;
… …
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
665object::vector object::objects; // not yet used
666object *object::first;
667
668object::object () 665object::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;
… …
676object::~object () 673object::~object ()
677{ 674{
678 free_key_values (this); 675 free_key_values (this);
679} 676}
680 677
678static int object_count;
679
681void object::link () 680void 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
695void object::unlink () 690void 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
708void 697void
709object::activate (bool recursive) 698object::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 708void
718 * of the list. */ 709object::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 */
740void 725void
741object::deactivate (bool recursive) 726object::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; 735void
761 active_prev = 0; 736object::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
744void
745object::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
823void 810void
824object::do_destroy () 811object::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
884void 866void
885object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
886{ 868{
… …
917 * environment, the x and y coordinates will be updated to 899 * environment, the x and y coordinates will be updated to
918 * the previous environment. 900 * the previous environment.
919 * Beware: This function is called from the editor as well! 901 * Beware: This function is called from the editor as well!
920 */ 902 */
921void 903void
922object::remove () 904object::remove_slow ()
923{ 905{
924 object *tmp, *last = 0; 906 object *tmp, *last = 0;
925 object *otmp; 907 object *otmp;
926 908
927 if (QUERY_FLAG (this, FLAG_REMOVED)) 909 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
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;
962 mapspace &ms = this->ms ();
979 963
980 /* link the object above us */ 964 /* link the object above us */
981 if (above) 965 if (above)
982 above->below = below; 966 above->below = below;
983 else 967 else
984 map->at (x, y).top = below; /* we were top, set new top */ 968 ms.top = below; /* we were top, set new top */
985 969
986 /* Relink the object below us, if there is one */ 970 /* Relink the object below us, if there is one */
987 if (below) 971 if (below)
988 below->above = above; 972 below->above = above;
989 else 973 else
… …
991 /* Nothing below, which means we need to relink map object for this space 975 /* Nothing below, which means we need to relink map object for this space
992 * use translated coordinates in case some oddness with map tiling is 976 * use translated coordinates in case some oddness with map tiling is
993 * evident 977 * evident
994 */ 978 */
995 if (GET_MAP_OB (map, x, y) != this) 979 if (GET_MAP_OB (map, x, y) != this)
996 {
997 char *dump = dump_object (this);
998 LOG (llevError,
999 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 980 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1000 free (dump);
1001 dump = dump_object (GET_MAP_OB (map, x, y));
1002 LOG (llevError, "%s\n", dump);
1003 free (dump);
1004 }
1005 981
1006 map->at (x, y).bot = above; /* goes on above it. */ 982 ms.bot = above; /* goes on above it. */
1007 } 983 }
1008 984
1009 above = 0; 985 above = 0;
1010 below = 0; 986 below = 0;
1011 987
1012 if (map->in_memory == MAP_SAVING) 988 if (map->in_memory == MAP_SAVING)
1013 return; 989 return;
1014 990
1015 int check_walk_off = !flag [FLAG_NO_APPLY]; 991 int check_walk_off = !flag [FLAG_NO_APPLY];
1016 992
1017 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 993 for (tmp = ms.bot; tmp; tmp = tmp->above)
1018 { 994 {
1019 /* No point updating the players look faces if he is the object 995 /* No point updating the players look faces if he is the object
1020 * being removed. 996 * being removed.
1021 */ 997 */
1022 998
… …
1056 } 1032 }
1057 1033
1058 /* last == NULL if there are no objects on this space */ 1034 /* last == NULL if there are no objects on this space */
1059 //TODO: this makes little sense, why only update the topmost object? 1035 //TODO: this makes little sense, why only update the topmost object?
1060 if (!last) 1036 if (!last)
1061 map->at (x, y).flags_ = P_NEED_UPDATE; 1037 map->at (x, y).flags_ = 0;
1062 else 1038 else
1063 update_object (last, UP_OBJ_REMOVE); 1039 update_object (last, UP_OBJ_REMOVE);
1064 1040
1065 if (flag [FLAG_BLOCKSVIEW] || glow_radius) 1041 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1066 update_all_los (map, x, y); 1042 update_all_los (map, x, y);
… …
1103 1079
1104 return 0; 1080 return 0;
1105} 1081}
1106 1082
1107/* 1083/*
1108 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1084 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1109 * job preparing multi-part monsters 1085 * job preparing multi-part monsters.
1110 */ 1086 */
1111object * 1087object *
1112insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1088insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1113{ 1089{
1114 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1142 */ 1118 */
1143object * 1119object *
1144insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1145{ 1121{
1146 object *tmp, *top, *floor = NULL; 1122 object *tmp, *top, *floor = NULL;
1147 sint16 x, y;
1148 1123
1149 if (QUERY_FLAG (op, FLAG_FREED)) 1124 if (QUERY_FLAG (op, FLAG_FREED))
1150 { 1125 {
1151 LOG (llevError, "Trying to insert freed object!\n"); 1126 LOG (llevError, "Trying to insert freed object!\n");
1152 return NULL; 1127 return NULL;
1153 } 1128 }
1129
1130 if (!QUERY_FLAG (op, FLAG_REMOVED))
1131 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1132
1133 op->remove ();
1154 1134
1155 if (!m) 1135 if (!m)
1156 { 1136 {
1157 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1158 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);
… …
1173#endif 1153#endif
1174 free (dump); 1154 free (dump);
1175 return op; 1155 return op;
1176 } 1156 }
1177 1157
1178 if (!QUERY_FLAG (op, FLAG_REMOVED))
1179 {
1180 char *dump = dump_object (op);
1181 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1182 free (dump);
1183 return op;
1184 }
1185
1186 if (op->more)
1187 {
1188 /* The part may be on a different map. */
1189
1190 object *more = op->more; 1158 if (object *more = op->more)
1191 1159 {
1192 /* We really need the caller to normalize coordinates - if
1193 * 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
1195 * is clear wrong do we normalize it.
1196 */
1197 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1198 more->map = get_map_from_coord (m, &more->x, &more->y);
1199 else if (!more->map)
1200 {
1201 /* For backwards compatibility - when not dealing with tiled maps,
1202 * more->map should always point to the parent.
1203 */
1204 more->map = m;
1205 }
1206
1207 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1160 if (!insert_ob_in_map (more, m, originator, flag))
1208 { 1161 {
1209 if (!op->head) 1162 if (!op->head)
1210 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1163 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1211 1164
1212 return 0; 1165 return 0;
… …
1217 1170
1218 /* Ideally, the caller figures this out. However, it complicates a lot 1171 /* Ideally, the caller figures this out. However, it complicates a lot
1219 * of areas of callers (eg, anything that uses find_free_spot would now 1172 * of areas of callers (eg, anything that uses find_free_spot would now
1220 * need extra work 1173 * need extra work
1221 */ 1174 */
1222 op->map = get_map_from_coord (m, &op->x, &op->y); 1175 if (!xy_normalise (m, op->x, op->y))
1223 x = op->x; 1176 return 0;
1224 y = op->y; 1177
1178 op->map = m;
1179 mapspace &ms = op->ms ();
1225 1180
1226 /* this has to be done after we translate the coordinates. 1181 /* this has to be done after we translate the coordinates.
1227 */ 1182 */
1228 if (op->nrof && !(flag & INS_NO_MERGE)) 1183 if (op->nrof && !(flag & INS_NO_MERGE))
1229 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1184 for (tmp = ms.bot; tmp; tmp = tmp->above)
1230 if (object::can_merge (op, tmp)) 1185 if (object::can_merge (op, tmp))
1231 { 1186 {
1232 op->nrof += tmp->nrof; 1187 op->nrof += tmp->nrof;
1233 tmp->destroy (); 1188 tmp->destroy ();
1234 } 1189 }
… …
1251 op->below = originator->below; 1206 op->below = originator->below;
1252 1207
1253 if (op->below) 1208 if (op->below)
1254 op->below->above = op; 1209 op->below->above = op;
1255 else 1210 else
1256 op->ms ().bot = op; 1211 ms.bot = op;
1257 1212
1258 /* since *below* originator, no need to update top */ 1213 /* since *below* originator, no need to update top */
1259 originator->below = op; 1214 originator->below = op;
1260 } 1215 }
1261 else 1216 else
1262 { 1217 {
1218 top = ms.bot;
1219
1263 /* If there are other objects, then */ 1220 /* If there are other objects, then */
1264 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1221 if ((!(flag & INS_MAP_LOAD)) && top)
1265 { 1222 {
1266 object *last = 0; 1223 object *last = 0;
1267 1224
1268 /* 1225 /*
1269 * If there are multiple objects on this space, we do some trickier handling. 1226 * If there are multiple objects on this space, we do some trickier handling.
… …
1275 * once we get to them. This reduces the need to traverse over all of 1232 * once we get to them. This reduces the need to traverse over all of
1276 * them when adding another one - this saves quite a bit of cpu time 1233 * them when adding another one - this saves quite a bit of cpu time
1277 * when lots of spells are cast in one area. Currently, it is presumed 1234 * when lots of spells are cast in one area. Currently, it is presumed
1278 * that flying non pickable objects are spell objects. 1235 * that flying non pickable objects are spell objects.
1279 */ 1236 */
1280 while (top) 1237 for (top = ms.bot; top; top = top->above)
1281 { 1238 {
1282 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1239 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1283 floor = top; 1240 floor = top;
1284 1241
1285 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1242 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1288 top = top->below; 1245 top = top->below;
1289 break; 1246 break;
1290 } 1247 }
1291 1248
1292 last = top; 1249 last = top;
1293 top = top->above;
1294 } 1250 }
1295 1251
1296 /* Don't want top to be NULL, so set it to the last valid object */ 1252 /* Don't want top to be NULL, so set it to the last valid object */
1297 top = last; 1253 top = last;
1298 1254
… …
1305 * Unless those objects are exits, type 66 1261 * Unless those objects are exits, type 66
1306 * If INS_ON_TOP is used, don't do this processing 1262 * If INS_ON_TOP is used, don't do this processing
1307 * Need to find the object that in fact blocks view, otherwise 1263 * Need to find the object that in fact blocks view, otherwise
1308 * stacking is a bit odd. 1264 * stacking is a bit odd.
1309 */ 1265 */
1310 if (!(flag & INS_ON_TOP) && 1266 if (!(flag & INS_ON_TOP)
1311 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1267 && ms.flags () & P_BLOCKSVIEW
1268 && (op->face && !op->face->visibility))
1312 { 1269 {
1313 for (last = top; last != floor; last = last->below) 1270 for (last = top; last != floor; last = last->below)
1314 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1315 break; 1272 break;
1273
1316 /* Check to see if we found the object that blocks view, 1274 /* Check to see if we found the object that blocks view,
1317 * and make sure we have a below pointer for it so that 1275 * and make sure we have a below pointer for it so that
1318 * we can get inserted below this one, which requires we 1276 * we can get inserted below this one, which requires we
1319 * set top to the object below us. 1277 * set top to the object below us.
1320 */ 1278 */
… …
1322 top = last->below; 1280 top = last->below;
1323 } 1281 }
1324 } /* If objects on this space */ 1282 } /* If objects on this space */
1325 1283
1326 if (flag & INS_MAP_LOAD) 1284 if (flag & INS_MAP_LOAD)
1327 top = GET_MAP_TOP (op->map, op->x, op->y); 1285 top = ms.top;
1328 1286
1329 if (flag & INS_ABOVE_FLOOR_ONLY) 1287 if (flag & INS_ABOVE_FLOOR_ONLY)
1330 top = floor; 1288 top = floor;
1331 1289
1332 /* Top is the object that our object (op) is going to get inserted above. 1290 /* Top is the object that our object (op) is going to get inserted above.
1333 */ 1291 */
1334 1292
1335 /* First object on this space */ 1293 /* First object on this space */
1336 if (!top) 1294 if (!top)
1337 { 1295 {
1338 op->above = GET_MAP_OB (op->map, op->x, op->y); 1296 op->above = ms.bot;
1339 1297
1340 if (op->above) 1298 if (op->above)
1341 op->above->below = op; 1299 op->above->below = op;
1342 1300
1343 op->below = 0; 1301 op->below = 0;
1344 op->ms ().bot = op; 1302 ms.bot = op;
1345 } 1303 }
1346 else 1304 else
1347 { /* get inserted into the stack above top */ 1305 { /* get inserted into the stack above top */
1348 op->above = top->above; 1306 op->above = top->above;
1349 1307
… …
1353 op->below = top; 1311 op->below = top;
1354 top->above = op; 1312 top->above = op;
1355 } 1313 }
1356 1314
1357 if (!op->above) 1315 if (!op->above)
1358 op->ms ().top = op; 1316 ms.top = op;
1359 } /* else not INS_BELOW_ORIGINATOR */ 1317 } /* else not INS_BELOW_ORIGINATOR */
1360 1318
1361 if (op->type == PLAYER) 1319 if (op->type == PLAYER)
1362 { 1320 {
1363 op->contr->do_los = 1; 1321 op->contr->do_los = 1;
1364 ++op->map->players; 1322 ++op->map->players;
1365 op->map->last_access = runtime; 1323 op->map->touch ();
1366 } 1324 }
1325
1326 op->map->dirty = true;
1367 1327
1368 /* If we have a floor, we know the player, if any, will be above 1328 /* 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. 1329 * it, so save a few ticks and start from there.
1370 */ 1330 */
1371 if (!(flag & INS_MAP_LOAD)) 1331 if (!(flag & INS_MAP_LOAD))
1372 if (object *pl = op->ms ().player ()) 1332 if (object *pl = ms.player ())
1373 if (pl->contr->ns) 1333 if (pl->contr->ns)
1374 pl->contr->ns->floorbox_update (); 1334 pl->contr->ns->floorbox_update ();
1375 1335
1376 /* If this object glows, it may affect lighting conditions that are 1336 /* If this object glows, it may affect lighting conditions that are
1377 * visible to others on this map. But update_all_los is really 1337 * 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 1338 * 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 1339 * on the map will get recalculated. The players could very well
1380 * be far away from this change and not affected in any way - 1340 * be far away from this change and not affected in any way -
1381 * this should get redone to only look for players within range, 1341 * this should get redone to only look for players within range,
1382 * or just updating the P_NEED_UPDATE for spaces within this area 1342 * or just updating the P_UPTODATE for spaces within this area
1383 * of effect may be sufficient. 1343 * of effect may be sufficient.
1384 */ 1344 */
1385 if (op->map->darkness && (op->glow_radius != 0)) 1345 if (op->map->darkness && (op->glow_radius != 0))
1386 update_all_los (op->map, op->x, op->y); 1346 update_all_los (op->map, op->x, op->y);
1387 1347
… …
1425{ 1385{
1426 object *tmp, *tmp1; 1386 object *tmp, *tmp1;
1427 1387
1428 /* first search for itself and remove any old instances */ 1388 /* first search for itself and remove any old instances */
1429 1389
1430 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1390 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1391 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1432 tmp->destroy (); 1392 tmp->destroy ();
1433 1393
1434 tmp1 = arch_to_object (archetype::find (arch_string)); 1394 tmp1 = arch_to_object (archetype::find (arch_string));
1435 1395
… …
1758 1718
1759 /* The objects have to be checked from top to bottom. 1719 /* The objects have to be checked from top to bottom.
1760 * Hence, we first go to the top: 1720 * Hence, we first go to the top:
1761 */ 1721 */
1762 1722
1763 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1723 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764 { 1724 {
1765 /* Trim the search when we find the first other spell effect 1725 /* Trim the search when we find the first other spell effect
1766 * this helps performance so that if a space has 50 spell objects, 1726 * this helps performance so that if a space has 50 spell objects,
1767 * we don't need to check all of them. 1727 * we don't need to check all of them.
1768 */ 1728 */
… …
1826 * The first matching object is returned, or NULL if none. 1786 * The first matching object is returned, or NULL if none.
1827 */ 1787 */
1828object * 1788object *
1829present_arch (const archetype *at, maptile *m, int x, int y) 1789present_arch (const archetype *at, maptile *m, int x, int y)
1830{ 1790{
1831 if (m == NULL || out_of_map (m, x, y)) 1791 if (!m || out_of_map (m, x, y))
1832 { 1792 {
1833 LOG (llevError, "Present_arch called outside map.\n"); 1793 LOG (llevError, "Present_arch called outside map.\n");
1834 return NULL; 1794 return NULL;
1835 } 1795 }
1836 1796
1837 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1797 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838 if (tmp->arch == at) 1798 if (tmp->arch == at)
1839 return tmp; 1799 return tmp;
1840 1800
1841 return NULL; 1801 return NULL;
1842} 1802}
… …
1853 { 1813 {
1854 LOG (llevError, "Present called outside map.\n"); 1814 LOG (llevError, "Present called outside map.\n");
1855 return NULL; 1815 return NULL;
1856 } 1816 }
1857 1817
1858 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1818 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859 if (tmp->type == type) 1819 if (tmp->type == type)
1860 return tmp; 1820 return tmp;
1861 1821
1862 return NULL; 1822 return NULL;
1863} 1823}
… …
2178 2138
2179 return 3; 2139 return 3;
2180} 2140}
2181 2141
2182/* 2142/*
2183 * absdir(int): Returns a number between 1 and 8, which represent
2184 * the "absolute" direction of a number (it actually takes care of
2185 * "overflow" in previous calculations of a direction).
2186 */
2187
2188int
2189absdir (int d)
2190{
2191 while (d < 1)
2192 d += 8;
2193
2194 while (d > 8)
2195 d -= 8;
2196
2197 return d;
2198}
2199
2200/*
2201 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2143 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202 * between two directions (which are expected to be absolute (see absdir()) 2144 * between two directions (which are expected to be absolute (see absdir())
2203 */ 2145 */
2204
2205int 2146int
2206dirdiff (int dir1, int dir2) 2147dirdiff (int dir1, int dir2)
2207{ 2148{
2208 int d; 2149 int d;
2209 2150
… …
2595object::flag_desc (char *desc, int len) const 2536object::flag_desc (char *desc, int len) const
2596{ 2537{
2597 char *p = desc; 2538 char *p = desc;
2598 bool first = true; 2539 bool first = true;
2599 2540
2541 *p = 0;
2542
2600 for (int i = 0; i < NUM_FLAGS; i++) 2543 for (int i = 0; i < NUM_FLAGS; i++)
2601 { 2544 {
2602 if (len <= 10) // magic constant! 2545 if (len <= 10) // magic constant!
2603 { 2546 {
2604 snprintf (p, len, ",..."); 2547 snprintf (p, len, ",...");
2605 break; 2548 break;
2606 } 2549 }
2607 2550
2608 if (flag[i]) 2551 if (flag [i])
2609 { 2552 {
2610 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2553 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2611 len -= cnt; 2554 len -= cnt;
2612 p += cnt; 2555 p += cnt;
2613 first = false; 2556 first = false;
… …
2615 } 2558 }
2616 2559
2617 return desc; 2560 return desc;
2618} 2561}
2619 2562
2620// return a suitable string describing an objetc in enough detail to find it 2563// return a suitable string describing an object in enough detail to find it
2621const char * 2564const char *
2622object::debug_desc (char *info) const 2565object::debug_desc (char *info) const
2623{ 2566{
2624 char flagdesc[512]; 2567 char flagdesc[512];
2625 char info2[256 * 4]; 2568 char info2[256 * 4];
2626 char *p = info; 2569 char *p = info;
2627 2570
2628 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2571 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2629 count, uuid.seq, 2572 count, uuid.seq,
2630 &name, 2573 &name,
2631 title ? "\",title:" : "", 2574 title ? "\",title:\"" : "",
2632 title ? (const char *)title : "", 2575 title ? (const char *)title : "",
2633 flag_desc (flagdesc, 512), type); 2576 flag_desc (flagdesc, 512), type);
2634 2577
2635 if (env) 2578 if (env)
2636 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2642} 2585}
2643 2586
2644const char * 2587const char *
2645object::debug_desc () const 2588object::debug_desc () const
2646{ 2589{
2647 static char info[256 * 3]; 2590 static char info[256 * 4];
2648 return debug_desc (info); 2591 return debug_desc (info);
2649} 2592}
2650 2593
2594const char *
2595object::debug_desc2 () const
2596{
2597 static char info[256 * 4];
2598 return debug_desc (info);
2599}
2600

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines