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.103 by root, Tue Jan 2 20:40:34 2007 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;
… …
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 *object::first;
666
667object::object () 665object::object ()
668{ 666{
669 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
670 668
671 expmul = 1.0; 669 expmul = 1.0;
… …
675object::~object () 673object::~object ()
676{ 674{
677 free_key_values (this); 675 free_key_values (this);
678} 676}
679 677
678static int object_count;
679
680void object::link () 680void object::link ()
681{ 681{
682 count = ++ob_count; 682 assert (!index);//D
683 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
684 685
685 prev = 0; 686 refcnt_inc ();
686 next = object::first; 687 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 688}
693 689
694void object::unlink () 690void object::unlink ()
695{ 691{
696 if (this == object::first) 692 assert (index);//D
697 object::first = next; 693 objects.erase (this);
698 694 refcnt_dec ();
699 /* Remove this object from the list of used objects */
700 if (prev) prev->next = next;
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 695}
712 696
713void 697void
714object::activate () 698object::activate ()
715{ 699{
716 /* If already on active list, don't do anything */ 700 /* If already on active list, don't do anything */
717 if (active ()) 701 if (active)
718 return; 702 return;
719 703
720 if (has_active_speed ()) 704 if (has_active_speed ())
721 { 705 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 706}
732 707
733void 708void
734object::activate_recursive () 709object::activate_recursive ()
735{ 710{
736 activate (); 711 activate ();
737 712
738 for (object *op = inv; op; op = op->above) 713 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 714 op->activate_recursive ();
740} 715}
741 716
742/* This function removes object 'op' from the list of active 717/* This function removes object 'op' from the list of active
743 * objects. 718 * objects.
… …
749 */ 724 */
750void 725void
751object::deactivate () 726object::deactivate ()
752{ 727{
753 /* If not on the active list, nothing needs to be done */ 728 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 729 if (!active)
755 return; 730 return;
756 731
757 if (active_prev == 0) 732 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 733}
773 734
774void 735void
775object::deactivate_recursive () 736object::deactivate_recursive ()
776{ 737{
777 for (object *op = inv; op; op = op->above) 738 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 739 op->deactivate_recursive ();
779 740
780 deactivate (); 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 }
781} 752}
782 753
783/* 754/*
784 * 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.
785 * object.c ? 756 * object.c ?
… …
818 789
819 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 792 || op->type == RUNE
822 || op->type == TRAP 793 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 796 op->destroy ();
825 else 797 else
826 map->insert (op, x, y); 798 map->insert (op, x, y);
827 } 799 }
828 } 800 }
… …
836} 808}
837 809
838void 810void
839object::do_destroy () 811object::do_destroy ()
840{ 812{
813 attachable::do_destroy ();
814
841 if (flag [FLAG_IS_LINKED]) 815 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 816 remove_button_link (this);
843 817
844 if (flag [FLAG_FRIENDLY]) 818 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 819 remove_friendly_object (this);
846 820
847 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
848 remove (); 822 remove ();
849 823
850 if (flag [FLAG_FREED]) 824 destroy_inv (true);
851 return;
852 825
853 set_speed (0); 826 deactivate ();
827 unlink ();
854 828
855 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 830
862 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
863 { 832 {
864 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
865 834
… …
890 859
891 // clear those pointers that likely might have circular references to us 860 // clear those pointers that likely might have circular references to us
892 owner = 0; 861 owner = 0;
893 enemy = 0; 862 enemy = 0;
894 attacked_by = 0; 863 attacked_by = 0;
895
896 // only relevant for players(?), but make sure of it anyways
897 contr = 0;
898} 864}
899 865
900void 866void
901object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
902{ 868{
… …
933 * environment, the x and y coordinates will be updated to 899 * environment, the x and y coordinates will be updated to
934 * the previous environment. 900 * the previous environment.
935 * Beware: This function is called from the editor as well! 901 * Beware: This function is called from the editor as well!
936 */ 902 */
937void 903void
938object::remove () 904object::remove_slow ()
939{ 905{
940 object *tmp, *last = 0; 906 object *tmp, *last = 0;
941 object *otmp; 907 object *otmp;
942 908
943 if (QUERY_FLAG (this, FLAG_REMOVED)) 909 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
991 --map->players; 957 --map->players;
992 map->touch (); 958 map->touch ();
993 } 959 }
994 960
995 map->dirty = true; 961 map->dirty = true;
962 mapspace &ms = this->ms ();
996 963
997 /* link the object above us */ 964 /* link the object above us */
998 if (above) 965 if (above)
999 above->below = below; 966 above->below = below;
1000 else 967 else
1001 map->at (x, y).top = below; /* we were top, set new top */ 968 ms.top = below; /* we were top, set new top */
1002 969
1003 /* Relink the object below us, if there is one */ 970 /* Relink the object below us, if there is one */
1004 if (below) 971 if (below)
1005 below->above = above; 972 below->above = above;
1006 else 973 else
… …
1008 /* 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
1009 * use translated coordinates in case some oddness with map tiling is 976 * use translated coordinates in case some oddness with map tiling is
1010 * evident 977 * evident
1011 */ 978 */
1012 if (GET_MAP_OB (map, x, y) != this) 979 if (GET_MAP_OB (map, x, y) != this)
1013 {
1014 char *dump = dump_object (this);
1015 LOG (llevError,
1016 "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 ());
1017 free (dump);
1018 dump = dump_object (GET_MAP_OB (map, x, y));
1019 LOG (llevError, "%s\n", dump);
1020 free (dump);
1021 }
1022 981
1023 map->at (x, y).bot = above; /* goes on above it. */ 982 ms.bot = above; /* goes on above it. */
1024 } 983 }
1025 984
1026 above = 0; 985 above = 0;
1027 below = 0; 986 below = 0;
1028 987
1029 if (map->in_memory == MAP_SAVING) 988 if (map->in_memory == MAP_SAVING)
1030 return; 989 return;
1031 990
1032 int check_walk_off = !flag [FLAG_NO_APPLY]; 991 int check_walk_off = !flag [FLAG_NO_APPLY];
1033 992
1034 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 993 for (tmp = ms.bot; tmp; tmp = tmp->above)
1035 { 994 {
1036 /* 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
1037 * being removed. 996 * being removed.
1038 */ 997 */
1039 998
… …
1120 1079
1121 return 0; 1080 return 0;
1122} 1081}
1123 1082
1124/* 1083/*
1125 * 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
1126 * job preparing multi-part monsters 1085 * job preparing multi-part monsters.
1127 */ 1086 */
1128object * 1087object *
1129insert_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)
1130{ 1089{
1131 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1159 */ 1118 */
1160object * 1119object *
1161insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1162{ 1121{
1163 object *tmp, *top, *floor = NULL; 1122 object *tmp, *top, *floor = NULL;
1164 sint16 x, y;
1165 1123
1166 if (QUERY_FLAG (op, FLAG_FREED)) 1124 if (QUERY_FLAG (op, FLAG_FREED))
1167 { 1125 {
1168 LOG (llevError, "Trying to insert freed object!\n"); 1126 LOG (llevError, "Trying to insert freed object!\n");
1169 return NULL; 1127 return NULL;
1170 } 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 ();
1171 1134
1172 if (!m) 1135 if (!m)
1173 { 1136 {
1174 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1175 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);
… …
1190#endif 1153#endif
1191 free (dump); 1154 free (dump);
1192 return op; 1155 return op;
1193 } 1156 }
1194 1157
1195 if (!QUERY_FLAG (op, FLAG_REMOVED))
1196 {
1197 char *dump = dump_object (op);
1198 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1199 free (dump);
1200 return op;
1201 }
1202
1203 if (op->more)
1204 {
1205 /* The part may be on a different map. */
1206
1207 object *more = op->more; 1158 if (object *more = op->more)
1208 1159 {
1209 /* We really need the caller to normalize coordinates - if
1210 * we set the map, that doesn't work if the location is within
1211 * a map and this is straddling an edge. So only if coordinate
1212 * is clear wrong do we normalize it.
1213 */
1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215 more->map = get_map_from_coord (m, &more->x, &more->y);
1216 else if (!more->map)
1217 {
1218 /* For backwards compatibility - when not dealing with tiled maps,
1219 * more->map should always point to the parent.
1220 */
1221 more->map = m;
1222 }
1223
1224 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1160 if (!insert_ob_in_map (more, m, originator, flag))
1225 { 1161 {
1226 if (!op->head) 1162 if (!op->head)
1227 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");
1228 1164
1229 return 0; 1165 return 0;
… …
1234 1170
1235 /* Ideally, the caller figures this out. However, it complicates a lot 1171 /* Ideally, the caller figures this out. However, it complicates a lot
1236 * 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
1237 * need extra work 1173 * need extra work
1238 */ 1174 */
1239 op->map = get_map_from_coord (m, &op->x, &op->y); 1175 if (!xy_normalise (m, op->x, op->y))
1240 x = op->x; 1176 return 0;
1241 y = op->y; 1177
1178 op->map = m;
1179 mapspace &ms = op->ms ();
1242 1180
1243 /* this has to be done after we translate the coordinates. 1181 /* this has to be done after we translate the coordinates.
1244 */ 1182 */
1245 if (op->nrof && !(flag & INS_NO_MERGE)) 1183 if (op->nrof && !(flag & INS_NO_MERGE))
1246 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1184 for (tmp = ms.bot; tmp; tmp = tmp->above)
1247 if (object::can_merge (op, tmp)) 1185 if (object::can_merge (op, tmp))
1248 { 1186 {
1249 op->nrof += tmp->nrof; 1187 op->nrof += tmp->nrof;
1250 tmp->destroy (); 1188 tmp->destroy ();
1251 } 1189 }
… …
1268 op->below = originator->below; 1206 op->below = originator->below;
1269 1207
1270 if (op->below) 1208 if (op->below)
1271 op->below->above = op; 1209 op->below->above = op;
1272 else 1210 else
1273 op->ms ().bot = op; 1211 ms.bot = op;
1274 1212
1275 /* since *below* originator, no need to update top */ 1213 /* since *below* originator, no need to update top */
1276 originator->below = op; 1214 originator->below = op;
1277 } 1215 }
1278 else 1216 else
1279 { 1217 {
1218 top = ms.bot;
1219
1280 /* If there are other objects, then */ 1220 /* If there are other objects, then */
1281 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1221 if ((!(flag & INS_MAP_LOAD)) && top)
1282 { 1222 {
1283 object *last = 0; 1223 object *last = 0;
1284 1224
1285 /* 1225 /*
1286 * 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.
… …
1292 * 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
1293 * 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
1294 * 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
1295 * that flying non pickable objects are spell objects. 1235 * that flying non pickable objects are spell objects.
1296 */ 1236 */
1297 while (top) 1237 for (top = ms.bot; top; top = top->above)
1298 { 1238 {
1299 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))
1300 floor = top; 1240 floor = top;
1301 1241
1302 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))
… …
1305 top = top->below; 1245 top = top->below;
1306 break; 1246 break;
1307 } 1247 }
1308 1248
1309 last = top; 1249 last = top;
1310 top = top->above;
1311 } 1250 }
1312 1251
1313 /* 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 */
1314 top = last; 1253 top = last;
1315 1254
… …
1322 * Unless those objects are exits, type 66 1261 * Unless those objects are exits, type 66
1323 * If INS_ON_TOP is used, don't do this processing 1262 * If INS_ON_TOP is used, don't do this processing
1324 * Need to find the object that in fact blocks view, otherwise 1263 * Need to find the object that in fact blocks view, otherwise
1325 * stacking is a bit odd. 1264 * stacking is a bit odd.
1326 */ 1265 */
1327 if (!(flag & INS_ON_TOP) && 1266 if (!(flag & INS_ON_TOP)
1328 (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))
1329 { 1269 {
1330 for (last = top; last != floor; last = last->below) 1270 for (last = top; last != floor; last = last->below)
1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1332 break; 1272 break;
1273
1333 /* Check to see if we found the object that blocks view, 1274 /* Check to see if we found the object that blocks view,
1334 * 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
1335 * we can get inserted below this one, which requires we 1276 * we can get inserted below this one, which requires we
1336 * set top to the object below us. 1277 * set top to the object below us.
1337 */ 1278 */
… …
1339 top = last->below; 1280 top = last->below;
1340 } 1281 }
1341 } /* If objects on this space */ 1282 } /* If objects on this space */
1342 1283
1343 if (flag & INS_MAP_LOAD) 1284 if (flag & INS_MAP_LOAD)
1344 top = GET_MAP_TOP (op->map, op->x, op->y); 1285 top = ms.top;
1345 1286
1346 if (flag & INS_ABOVE_FLOOR_ONLY) 1287 if (flag & INS_ABOVE_FLOOR_ONLY)
1347 top = floor; 1288 top = floor;
1348 1289
1349 /* 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.
1350 */ 1291 */
1351 1292
1352 /* First object on this space */ 1293 /* First object on this space */
1353 if (!top) 1294 if (!top)
1354 { 1295 {
1355 op->above = GET_MAP_OB (op->map, op->x, op->y); 1296 op->above = ms.bot;
1356 1297
1357 if (op->above) 1298 if (op->above)
1358 op->above->below = op; 1299 op->above->below = op;
1359 1300
1360 op->below = 0; 1301 op->below = 0;
1361 op->ms ().bot = op; 1302 ms.bot = op;
1362 } 1303 }
1363 else 1304 else
1364 { /* get inserted into the stack above top */ 1305 { /* get inserted into the stack above top */
1365 op->above = top->above; 1306 op->above = top->above;
1366 1307
… …
1370 op->below = top; 1311 op->below = top;
1371 top->above = op; 1312 top->above = op;
1372 } 1313 }
1373 1314
1374 if (!op->above) 1315 if (!op->above)
1375 op->ms ().top = op; 1316 ms.top = op;
1376 } /* else not INS_BELOW_ORIGINATOR */ 1317 } /* else not INS_BELOW_ORIGINATOR */
1377 1318
1378 if (op->type == PLAYER) 1319 if (op->type == PLAYER)
1379 { 1320 {
1380 op->contr->do_los = 1; 1321 op->contr->do_los = 1;
… …
1386 1327
1387 /* 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
1388 * it, so save a few ticks and start from there. 1329 * it, so save a few ticks and start from there.
1389 */ 1330 */
1390 if (!(flag & INS_MAP_LOAD)) 1331 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1332 if (object *pl = ms.player ())
1392 if (pl->contr->ns) 1333 if (pl->contr->ns)
1393 pl->contr->ns->floorbox_update (); 1334 pl->contr->ns->floorbox_update ();
1394 1335
1395 /* If this object glows, it may affect lighting conditions that are 1336 /* If this object glows, it may affect lighting conditions that are
1396 * 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
… …
1444{ 1385{
1445 object *tmp, *tmp1; 1386 object *tmp, *tmp1;
1446 1387
1447 /* first search for itself and remove any old instances */ 1388 /* first search for itself and remove any old instances */
1448 1389
1449 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)
1450 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1391 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1451 tmp->destroy (); 1392 tmp->destroy ();
1452 1393
1453 tmp1 = arch_to_object (archetype::find (arch_string)); 1394 tmp1 = arch_to_object (archetype::find (arch_string));
1454 1395
… …
1777 1718
1778 /* The objects have to be checked from top to bottom. 1719 /* The objects have to be checked from top to bottom.
1779 * Hence, we first go to the top: 1720 * Hence, we first go to the top:
1780 */ 1721 */
1781 1722
1782 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)
1783 { 1724 {
1784 /* Trim the search when we find the first other spell effect 1725 /* Trim the search when we find the first other spell effect
1785 * 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,
1786 * we don't need to check all of them. 1727 * we don't need to check all of them.
1787 */ 1728 */
… …
1845 * The first matching object is returned, or NULL if none. 1786 * The first matching object is returned, or NULL if none.
1846 */ 1787 */
1847object * 1788object *
1848present_arch (const archetype *at, maptile *m, int x, int y) 1789present_arch (const archetype *at, maptile *m, int x, int y)
1849{ 1790{
1850 if (m == NULL || out_of_map (m, x, y)) 1791 if (!m || out_of_map (m, x, y))
1851 { 1792 {
1852 LOG (llevError, "Present_arch called outside map.\n"); 1793 LOG (llevError, "Present_arch called outside map.\n");
1853 return NULL; 1794 return NULL;
1854 } 1795 }
1855 1796
1856 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)
1857 if (tmp->arch == at) 1798 if (tmp->arch == at)
1858 return tmp; 1799 return tmp;
1859 1800
1860 return NULL; 1801 return NULL;
1861} 1802}
… …
1872 { 1813 {
1873 LOG (llevError, "Present called outside map.\n"); 1814 LOG (llevError, "Present called outside map.\n");
1874 return NULL; 1815 return NULL;
1875 } 1816 }
1876 1817
1877 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)
1878 if (tmp->type == type) 1819 if (tmp->type == type)
1879 return tmp; 1820 return tmp;
1880 1821
1881 return NULL; 1822 return NULL;
1882} 1823}
… …
2197 2138
2198 return 3; 2139 return 3;
2199} 2140}
2200 2141
2201/* 2142/*
2202 * absdir(int): Returns a number between 1 and 8, which represent
2203 * the "absolute" direction of a number (it actually takes care of
2204 * "overflow" in previous calculations of a direction).
2205 */
2206
2207int
2208absdir (int d)
2209{
2210 while (d < 1)
2211 d += 8;
2212
2213 while (d > 8)
2214 d -= 8;
2215
2216 return d;
2217}
2218
2219/*
2220 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2143 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2221 * between two directions (which are expected to be absolute (see absdir()) 2144 * between two directions (which are expected to be absolute (see absdir())
2222 */ 2145 */
2223
2224int 2146int
2225dirdiff (int dir1, int dir2) 2147dirdiff (int dir1, int dir2)
2226{ 2148{
2227 int d; 2149 int d;
2228 2150
… …
2644{ 2566{
2645 char flagdesc[512]; 2567 char flagdesc[512];
2646 char info2[256 * 4]; 2568 char info2[256 * 4];
2647 char *p = info; 2569 char *p = info;
2648 2570
2649 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}",
2650 count, uuid.seq, 2572 count, uuid.seq,
2651 &name, 2573 &name,
2652 title ? "\",title:" : "", 2574 title ? "\",title:\"" : "",
2653 title ? (const char *)title : "", 2575 title ? (const char *)title : "",
2654 flag_desc (flagdesc, 512), type); 2576 flag_desc (flagdesc, 512), type);
2655 2577
2656 if (env) 2578 if (env)
2657 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2667{ 2589{
2668 static char info[256 * 4]; 2590 static char info[256 * 4];
2669 return debug_desc (info); 2591 return debug_desc (info);
2670} 2592}
2671 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