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.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.117 by root, Thu Jan 18 16:19:34 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
… …
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
39static UUID uuid; 39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
41 41
42object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
43 44
44short 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,
45 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
46}; 47};
47short 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,
… …
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
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 for (object *op = object::first; op; op = op->next) 400 for_all_objects (op)
401 if (op->count == i) 401 if (op->count == i)
402 return op; 402 return op;
403 403
404 return 0; 404 return 0;
405} 405}
406 406
407/* 407/*
408 * 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.
409 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 410 * Enables features like "patch <name-of-other-player> food 999"
411 */ 411 */
412
413object * 412object *
414find_object_name (const char *str) 413find_object_name (const char *str)
415{ 414{
416 shstr_cmp str_ (str); 415 shstr_cmp str_ (str);
417 object *op; 416 object *op;
418 417
419 for (op = object::first; op != NULL; op = op->next) 418 for_all_objects (op)
420 if (op->name == str_) 419 if (op->name == str_)
421 break; 420 break;
422 421
423 return op; 422 return op;
424} 423}
… …
661 660
662 if (op->more) 661 if (op->more)
663 update_object (op->more, action); 662 update_object (op->more, action);
664} 663}
665 664
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}
707
708bool
709object::active () const
710{
711 return active_next || active_prev || this == active_objects;
712} 695}
713 696
714void 697void
715object::activate () 698object::activate ()
716{ 699{
717 /* If already on active list, don't do anything */ 700 /* If already on active list, don't do anything */
718 if (active ()) 701 if (active)
719 return; 702 return;
720 703
721 if (has_active_speed ()) 704 if (has_active_speed ())
722 { 705 actives.insert (this);
723 /* process_events() expects us to insert the object at the beginning
724 * of the list. */
725 active_next = active_objects;
726
727 if (active_next)
728 active_next->active_prev = this;
729
730 active_objects = this;
731 }
732} 706}
733 707
734void 708void
735object::activate_recursive () 709object::activate_recursive ()
736{ 710{
… …
750 */ 724 */
751void 725void
752object::deactivate () 726object::deactivate ()
753{ 727{
754 /* If not on the active list, nothing needs to be done */ 728 /* If not on the active list, nothing needs to be done */
755 if (!active ()) 729 if (!active)
756 return; 730 return;
757 731
758 if (active_prev == 0) 732 actives.erase (this);
759 {
760 active_objects = active_next;
761 if (active_next)
762 active_next->active_prev = 0;
763 }
764 else
765 {
766 active_prev->active_next = active_next;
767 if (active_next)
768 active_next->active_prev = active_prev;
769 }
770
771 active_next = 0;
772 active_prev = 0;
773} 733}
774 734
775void 735void
776object::deactivate_recursive () 736object::deactivate_recursive ()
777{ 737{
… …
829 789
830 if (op->flag [FLAG_STARTEQUIP] 790 if (op->flag [FLAG_STARTEQUIP]
831 || op->flag [FLAG_NO_DROP] 791 || op->flag [FLAG_NO_DROP]
832 || op->type == RUNE 792 || op->type == RUNE
833 || op->type == TRAP 793 || op->type == TRAP
834 || op->flag [FLAG_IS_A_TEMPLATE]) 794 || op->flag [FLAG_IS_A_TEMPLATE]
795 || op->flag [FLAG_DESTROY_ON_DEATH])
835 op->destroy (); 796 op->destroy ();
836 else 797 else
837 map->insert (op, x, y); 798 map->insert (op, x, y);
838 } 799 }
839 } 800 }
… …
847} 808}
848 809
849void 810void
850object::do_destroy () 811object::do_destroy ()
851{ 812{
813 attachable::do_destroy ();
814
852 if (flag [FLAG_IS_LINKED]) 815 if (flag [FLAG_IS_LINKED])
853 remove_button_link (this); 816 remove_button_link (this);
854 817
855 if (flag [FLAG_FRIENDLY]) 818 if (flag [FLAG_FRIENDLY])
856 remove_friendly_object (this); 819 remove_friendly_object (this);
857 820
858 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
859 remove (); 822 remove ();
860 823
861 if (flag [FLAG_FREED]) 824 destroy_inv (true);
862 return;
863 825
864 set_speed (0); 826 deactivate ();
827 unlink ();
865 828
866 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
867
868 attachable::do_destroy ();
869
870 destroy_inv (true);
871 unlink ();
872 830
873 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
874 { 832 {
875 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
876 834
… …
901 859
902 // clear those pointers that likely might have circular references to us 860 // clear those pointers that likely might have circular references to us
903 owner = 0; 861 owner = 0;
904 enemy = 0; 862 enemy = 0;
905 attacked_by = 0; 863 attacked_by = 0;
906
907 // only relevant for players(?), but make sure of it anyways
908 contr = 0;
909} 864}
910 865
911void 866void
912object::destroy (bool destroy_inventory) 867object::destroy (bool destroy_inventory)
913{ 868{
… …
944 * environment, the x and y coordinates will be updated to 899 * environment, the x and y coordinates will be updated to
945 * the previous environment. 900 * the previous environment.
946 * Beware: This function is called from the editor as well! 901 * Beware: This function is called from the editor as well!
947 */ 902 */
948void 903void
949object::remove () 904object::remove_slow ()
950{ 905{
951 object *tmp, *last = 0; 906 object *tmp, *last = 0;
952 object *otmp; 907 object *otmp;
953 908
954 if (QUERY_FLAG (this, FLAG_REMOVED)) 909 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
1002 --map->players; 957 --map->players;
1003 map->touch (); 958 map->touch ();
1004 } 959 }
1005 960
1006 map->dirty = true; 961 map->dirty = true;
962 mapspace &ms = this->ms ();
1007 963
1008 /* link the object above us */ 964 /* link the object above us */
1009 if (above) 965 if (above)
1010 above->below = below; 966 above->below = below;
1011 else 967 else
1012 map->at (x, y).top = below; /* we were top, set new top */ 968 ms.top = below; /* we were top, set new top */
1013 969
1014 /* Relink the object below us, if there is one */ 970 /* Relink the object below us, if there is one */
1015 if (below) 971 if (below)
1016 below->above = above; 972 below->above = above;
1017 else 973 else
… …
1019 /* 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
1020 * use translated coordinates in case some oddness with map tiling is 976 * use translated coordinates in case some oddness with map tiling is
1021 * evident 977 * evident
1022 */ 978 */
1023 if (GET_MAP_OB (map, x, y) != this) 979 if (GET_MAP_OB (map, x, y) != this)
1024 {
1025 char *dump = dump_object (this);
1026 LOG (llevError,
1027 "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 ());
1028 free (dump);
1029 dump = dump_object (GET_MAP_OB (map, x, y));
1030 LOG (llevError, "%s\n", dump);
1031 free (dump);
1032 }
1033 981
1034 map->at (x, y).bot = above; /* goes on above it. */ 982 ms.bot = above; /* goes on above it. */
1035 } 983 }
1036 984
1037 above = 0; 985 above = 0;
1038 below = 0; 986 below = 0;
1039 987
1040 if (map->in_memory == MAP_SAVING) 988 if (map->in_memory == MAP_SAVING)
1041 return; 989 return;
1042 990
1043 int check_walk_off = !flag [FLAG_NO_APPLY]; 991 int check_walk_off = !flag [FLAG_NO_APPLY];
1044 992
1045 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 993 for (tmp = ms.bot; tmp; tmp = tmp->above)
1046 { 994 {
1047 /* 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
1048 * being removed. 996 * being removed.
1049 */ 997 */
1050 998
… …
1131 1079
1132 return 0; 1080 return 0;
1133} 1081}
1134 1082
1135/* 1083/*
1136 * 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
1137 * job preparing multi-part monsters 1085 * job preparing multi-part monsters.
1138 */ 1086 */
1139object * 1087object *
1140insert_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)
1141{ 1089{
1142 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1170 */ 1118 */
1171object * 1119object *
1172insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1173{ 1121{
1174 object *tmp, *top, *floor = NULL; 1122 object *tmp, *top, *floor = NULL;
1175 sint16 x, y;
1176 1123
1177 if (QUERY_FLAG (op, FLAG_FREED)) 1124 if (QUERY_FLAG (op, FLAG_FREED))
1178 { 1125 {
1179 LOG (llevError, "Trying to insert freed object!\n"); 1126 LOG (llevError, "Trying to insert freed object!\n");
1180 return NULL; 1127 return NULL;
1181 } 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 ();
1182 1134
1183 if (!m) 1135 if (!m)
1184 { 1136 {
1185 char *dump = dump_object (op); 1137 char *dump = dump_object (op);
1186 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);
… …
1201#endif 1153#endif
1202 free (dump); 1154 free (dump);
1203 return op; 1155 return op;
1204 } 1156 }
1205 1157
1206 if (!QUERY_FLAG (op, FLAG_REMOVED))
1207 {
1208 char *dump = dump_object (op);
1209 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1210 free (dump);
1211 return op;
1212 }
1213
1214 if (op->more)
1215 {
1216 /* The part may be on a different map. */
1217
1218 object *more = op->more; 1158 if (object *more = op->more)
1219 1159 {
1220 /* We really need the caller to normalise coordinates - if
1221 * we set the map, that doesn't work if the location is within
1222 * a map and this is straddling an edge. So only if coordinate
1223 * is clear wrong do we normalise it.
1224 */
1225 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1226 more->map = get_map_from_coord (m, &more->x, &more->y);
1227 else if (!more->map)
1228 {
1229 /* For backwards compatibility - when not dealing with tiled maps,
1230 * more->map should always point to the parent.
1231 */
1232 more->map = m;
1233 }
1234
1235 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1160 if (!insert_ob_in_map (more, m, originator, flag))
1236 { 1161 {
1237 if (!op->head) 1162 if (!op->head)
1238 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");
1239 1164
1240 return 0; 1165 return 0;
… …
1245 1170
1246 /* Ideally, the caller figures this out. However, it complicates a lot 1171 /* Ideally, the caller figures this out. However, it complicates a lot
1247 * 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
1248 * need extra work 1173 * need extra work
1249 */ 1174 */
1250 op->map = get_map_from_coord (m, &op->x, &op->y); 1175 if (!xy_normalise (m, op->x, op->y))
1251 x = op->x; 1176 return 0;
1252 y = op->y; 1177
1178 op->map = m;
1179 mapspace &ms = op->ms ();
1253 1180
1254 /* this has to be done after we translate the coordinates. 1181 /* this has to be done after we translate the coordinates.
1255 */ 1182 */
1256 if (op->nrof && !(flag & INS_NO_MERGE)) 1183 if (op->nrof && !(flag & INS_NO_MERGE))
1257 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1184 for (tmp = ms.bot; tmp; tmp = tmp->above)
1258 if (object::can_merge (op, tmp)) 1185 if (object::can_merge (op, tmp))
1259 { 1186 {
1260 op->nrof += tmp->nrof; 1187 op->nrof += tmp->nrof;
1261 tmp->destroy (); 1188 tmp->destroy ();
1262 } 1189 }
… …
1279 op->below = originator->below; 1206 op->below = originator->below;
1280 1207
1281 if (op->below) 1208 if (op->below)
1282 op->below->above = op; 1209 op->below->above = op;
1283 else 1210 else
1284 op->ms ().bot = op; 1211 ms.bot = op;
1285 1212
1286 /* since *below* originator, no need to update top */ 1213 /* since *below* originator, no need to update top */
1287 originator->below = op; 1214 originator->below = op;
1288 } 1215 }
1289 else 1216 else
1290 { 1217 {
1218 top = ms.bot;
1219
1291 /* If there are other objects, then */ 1220 /* If there are other objects, then */
1292 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1221 if ((!(flag & INS_MAP_LOAD)) && top)
1293 { 1222 {
1294 object *last = 0; 1223 object *last = 0;
1295 1224
1296 /* 1225 /*
1297 * 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.
… …
1303 * 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
1304 * 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
1305 * 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
1306 * that flying non pickable objects are spell objects. 1235 * that flying non pickable objects are spell objects.
1307 */ 1236 */
1308 while (top) 1237 for (top = ms.bot; top; top = top->above)
1309 { 1238 {
1310 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))
1311 floor = top; 1240 floor = top;
1312 1241
1313 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))
… …
1316 top = top->below; 1245 top = top->below;
1317 break; 1246 break;
1318 } 1247 }
1319 1248
1320 last = top; 1249 last = top;
1321 top = top->above;
1322 } 1250 }
1323 1251
1324 /* 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 */
1325 top = last; 1253 top = last;
1326 1254
… …
1333 * Unless those objects are exits, type 66 1261 * Unless those objects are exits, type 66
1334 * If INS_ON_TOP is used, don't do this processing 1262 * If INS_ON_TOP is used, don't do this processing
1335 * Need to find the object that in fact blocks view, otherwise 1263 * Need to find the object that in fact blocks view, otherwise
1336 * stacking is a bit odd. 1264 * stacking is a bit odd.
1337 */ 1265 */
1338 if (!(flag & INS_ON_TOP) && 1266 if (!(flag & INS_ON_TOP)
1339 (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))
1340 { 1269 {
1341 for (last = top; last != floor; last = last->below) 1270 for (last = top; last != floor; last = last->below)
1342 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1343 break; 1272 break;
1273
1344 /* Check to see if we found the object that blocks view, 1274 /* Check to see if we found the object that blocks view,
1345 * 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
1346 * we can get inserted below this one, which requires we 1276 * we can get inserted below this one, which requires we
1347 * set top to the object below us. 1277 * set top to the object below us.
1348 */ 1278 */
… …
1350 top = last->below; 1280 top = last->below;
1351 } 1281 }
1352 } /* If objects on this space */ 1282 } /* If objects on this space */
1353 1283
1354 if (flag & INS_MAP_LOAD) 1284 if (flag & INS_MAP_LOAD)
1355 top = GET_MAP_TOP (op->map, op->x, op->y); 1285 top = ms.top;
1356 1286
1357 if (flag & INS_ABOVE_FLOOR_ONLY) 1287 if (flag & INS_ABOVE_FLOOR_ONLY)
1358 top = floor; 1288 top = floor;
1359 1289
1360 /* 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.
1361 */ 1291 */
1362 1292
1363 /* First object on this space */ 1293 /* First object on this space */
1364 if (!top) 1294 if (!top)
1365 { 1295 {
1366 op->above = GET_MAP_OB (op->map, op->x, op->y); 1296 op->above = ms.bot;
1367 1297
1368 if (op->above) 1298 if (op->above)
1369 op->above->below = op; 1299 op->above->below = op;
1370 1300
1371 op->below = 0; 1301 op->below = 0;
1372 op->ms ().bot = op; 1302 ms.bot = op;
1373 } 1303 }
1374 else 1304 else
1375 { /* get inserted into the stack above top */ 1305 { /* get inserted into the stack above top */
1376 op->above = top->above; 1306 op->above = top->above;
1377 1307
… …
1381 op->below = top; 1311 op->below = top;
1382 top->above = op; 1312 top->above = op;
1383 } 1313 }
1384 1314
1385 if (!op->above) 1315 if (!op->above)
1386 op->ms ().top = op; 1316 ms.top = op;
1387 } /* else not INS_BELOW_ORIGINATOR */ 1317 } /* else not INS_BELOW_ORIGINATOR */
1388 1318
1389 if (op->type == PLAYER) 1319 if (op->type == PLAYER)
1390 { 1320 {
1391 op->contr->do_los = 1; 1321 op->contr->do_los = 1;
… …
1397 1327
1398 /* 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
1399 * it, so save a few ticks and start from there. 1329 * it, so save a few ticks and start from there.
1400 */ 1330 */
1401 if (!(flag & INS_MAP_LOAD)) 1331 if (!(flag & INS_MAP_LOAD))
1402 if (object *pl = op->ms ().player ()) 1332 if (object *pl = ms.player ())
1403 if (pl->contr->ns) 1333 if (pl->contr->ns)
1404 pl->contr->ns->floorbox_update (); 1334 pl->contr->ns->floorbox_update ();
1405 1335
1406 /* If this object glows, it may affect lighting conditions that are 1336 /* If this object glows, it may affect lighting conditions that are
1407 * 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
… …
2208 2138
2209 return 3; 2139 return 3;
2210} 2140}
2211 2141
2212/* 2142/*
2213 * absdir(int): Returns a number between 1 and 8, which represent
2214 * the "absolute" direction of a number (it actually takes care of
2215 * "overflow" in previous calculations of a direction).
2216 */
2217
2218int
2219absdir (int d)
2220{
2221 while (d < 1)
2222 d += 8;
2223
2224 while (d > 8)
2225 d -= 8;
2226
2227 return d;
2228}
2229
2230/*
2231 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2143 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2232 * between two directions (which are expected to be absolute (see absdir()) 2144 * between two directions (which are expected to be absolute (see absdir())
2233 */ 2145 */
2234
2235int 2146int
2236dirdiff (int dir1, int dir2) 2147dirdiff (int dir1, int dir2)
2237{ 2148{
2238 int d; 2149 int d;
2239 2150
… …
2655{ 2566{
2656 char flagdesc[512]; 2567 char flagdesc[512];
2657 char info2[256 * 4]; 2568 char info2[256 * 4];
2658 char *p = info; 2569 char *p = info;
2659 2570
2660 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}",
2661 count, uuid.seq, 2572 count, uuid.seq,
2662 &name, 2573 &name,
2663 title ? "\",title:" : "", 2574 title ? "\",title:\"" : "",
2664 title ? (const char *)title : "", 2575 title ? (const char *)title : "",
2665 flag_desc (flagdesc, 512), type); 2576 flag_desc (flagdesc, 512), type);
2666 2577
2667 if (env) 2578 if (env)
2668 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2678{ 2589{
2679 static char info[256 * 4]; 2590 static char info[256 * 4];
2680 return debug_desc (info); 2591 return debug_desc (info);
2681} 2592}
2682 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