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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.120 by root, Sun Jan 21 21:28:27 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;
672 face = blank_face; 670 face = blank_face;
673} 671}
674 672
675object::~object () 673object::~object ()
676{ 674{
675 if (index)
676 unlink ();
677
677 free_key_values (this); 678 free_key_values (this);
678} 679}
679 680
681static int object_count;
682
680void object::link () 683void object::link ()
681{ 684{
682 count = ++ob_count; 685 assert (!index);//D
683 uuid = gen_uuid (); 686 uuid = gen_uuid ();
687 count = ++object_count;
684 688
685 prev = 0; 689 refcnt_inc ();
686 next = object::first; 690 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 691}
693 692
694void object::unlink () 693void object::unlink ()
695{ 694{
696 if (this == object::first) 695 assert (index);//D
697 object::first = next; 696 objects.erase (this);
698 697 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} 698}
712 699
713void 700void
714object::activate () 701object::activate ()
715{ 702{
716 /* If already on active list, don't do anything */ 703 /* If already on active list, don't do anything */
717 if (active ()) 704 if (active)
718 return; 705 return;
719 706
720 if (has_active_speed ()) 707 if (has_active_speed ())
721 { 708 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} 709}
732 710
733void 711void
734object::activate_recursive () 712object::activate_recursive ()
735{ 713{
… …
749 */ 727 */
750void 728void
751object::deactivate () 729object::deactivate ()
752{ 730{
753 /* If not on the active list, nothing needs to be done */ 731 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 732 if (!active)
755 return; 733 return;
756 734
757 if (active_prev == 0) 735 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} 736}
773 737
774void 738void
775object::deactivate_recursive () 739object::deactivate_recursive ()
776{ 740{
… …
828 792
829 if (op->flag [FLAG_STARTEQUIP] 793 if (op->flag [FLAG_STARTEQUIP]
830 || op->flag [FLAG_NO_DROP] 794 || op->flag [FLAG_NO_DROP]
831 || op->type == RUNE 795 || op->type == RUNE
832 || op->type == TRAP 796 || op->type == TRAP
833 || op->flag [FLAG_IS_A_TEMPLATE]) 797 || op->flag [FLAG_IS_A_TEMPLATE]
798 || op->flag [FLAG_DESTROY_ON_DEATH])
834 op->destroy (); 799 op->destroy ();
835 else 800 else
836 map->insert (op, x, y); 801 map->insert (op, x, y);
837 } 802 }
838 } 803 }
… …
846} 811}
847 812
848void 813void
849object::do_destroy () 814object::do_destroy ()
850{ 815{
816 attachable::do_destroy ();
817
851 if (flag [FLAG_IS_LINKED]) 818 if (flag [FLAG_IS_LINKED])
852 remove_button_link (this); 819 remove_button_link (this);
853 820
854 if (flag [FLAG_FRIENDLY]) 821 if (flag [FLAG_FRIENDLY])
855 remove_friendly_object (this); 822 remove_friendly_object (this);
856 823
857 if (!flag [FLAG_REMOVED]) 824 if (!flag [FLAG_REMOVED])
858 remove (); 825 remove ();
859 826
860 if (flag [FLAG_FREED]) 827 destroy_inv (true);
861 return;
862 828
863 set_speed (0); 829 deactivate ();
830 unlink ();
864 831
865 flag [FLAG_FREED] = 1; 832 flag [FLAG_FREED] = 1;
866
867 attachable::do_destroy ();
868
869 destroy_inv (true);
870 unlink ();
871 833
872 // hack to ensure that freed objects still have a valid map 834 // hack to ensure that freed objects still have a valid map
873 { 835 {
874 static maptile *freed_map; // freed objects are moved here to avoid crashes 836 static maptile *freed_map; // freed objects are moved here to avoid crashes
875 837
… …
900 862
901 // clear those pointers that likely might have circular references to us 863 // clear those pointers that likely might have circular references to us
902 owner = 0; 864 owner = 0;
903 enemy = 0; 865 enemy = 0;
904 attacked_by = 0; 866 attacked_by = 0;
905
906 // only relevant for players(?), but make sure of it anyways
907 contr = 0;
908} 867}
909 868
910void 869void
911object::destroy (bool destroy_inventory) 870object::destroy (bool destroy_inventory)
912{ 871{
… …
943 * environment, the x and y coordinates will be updated to 902 * environment, the x and y coordinates will be updated to
944 * the previous environment. 903 * the previous environment.
945 * Beware: This function is called from the editor as well! 904 * Beware: This function is called from the editor as well!
946 */ 905 */
947void 906void
948object::remove () 907object::remove_slow ()
949{ 908{
950 object *tmp, *last = 0; 909 object *tmp, *last = 0;
951 object *otmp; 910 object *otmp;
952 911
953 if (QUERY_FLAG (this, FLAG_REMOVED)) 912 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
1001 --map->players; 960 --map->players;
1002 map->touch (); 961 map->touch ();
1003 } 962 }
1004 963
1005 map->dirty = true; 964 map->dirty = true;
965 mapspace &ms = this->ms ();
1006 966
1007 /* link the object above us */ 967 /* link the object above us */
1008 if (above) 968 if (above)
1009 above->below = below; 969 above->below = below;
1010 else 970 else
1011 map->at (x, y).top = below; /* we were top, set new top */ 971 ms.top = below; /* we were top, set new top */
1012 972
1013 /* Relink the object below us, if there is one */ 973 /* Relink the object below us, if there is one */
1014 if (below) 974 if (below)
1015 below->above = above; 975 below->above = above;
1016 else 976 else
… …
1018 /* Nothing below, which means we need to relink map object for this space 978 /* Nothing below, which means we need to relink map object for this space
1019 * use translated coordinates in case some oddness with map tiling is 979 * use translated coordinates in case some oddness with map tiling is
1020 * evident 980 * evident
1021 */ 981 */
1022 if (GET_MAP_OB (map, x, y) != this) 982 if (GET_MAP_OB (map, x, y) != this)
1023 {
1024 char *dump = dump_object (this);
1025 LOG (llevError,
1026 "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); 983 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 ());
1027 free (dump);
1028 dump = dump_object (GET_MAP_OB (map, x, y));
1029 LOG (llevError, "%s\n", dump);
1030 free (dump);
1031 }
1032 984
1033 map->at (x, y).bot = above; /* goes on above it. */ 985 ms.bot = above; /* goes on above it. */
1034 } 986 }
1035 987
1036 above = 0; 988 above = 0;
1037 below = 0; 989 below = 0;
1038 990
1039 if (map->in_memory == MAP_SAVING) 991 if (map->in_memory == MAP_SAVING)
1040 return; 992 return;
1041 993
1042 int check_walk_off = !flag [FLAG_NO_APPLY]; 994 int check_walk_off = !flag [FLAG_NO_APPLY];
1043 995
1044 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 996 for (tmp = ms.bot; tmp; tmp = tmp->above)
1045 { 997 {
1046 /* No point updating the players look faces if he is the object 998 /* No point updating the players look faces if he is the object
1047 * being removed. 999 * being removed.
1048 */ 1000 */
1049 1001
… …
1130 1082
1131 return 0; 1083 return 0;
1132} 1084}
1133 1085
1134/* 1086/*
1135 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1087 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1136 * job preparing multi-part monsters 1088 * job preparing multi-part monsters.
1137 */ 1089 */
1138object * 1090object *
1139insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1091insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1140{ 1092{
1141 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1093 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1169 */ 1121 */
1170object * 1122object *
1171insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1123insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1172{ 1124{
1173 object *tmp, *top, *floor = NULL; 1125 object *tmp, *top, *floor = NULL;
1174 sint16 x, y;
1175 1126
1176 if (QUERY_FLAG (op, FLAG_FREED)) 1127 if (QUERY_FLAG (op, FLAG_FREED))
1177 { 1128 {
1178 LOG (llevError, "Trying to insert freed object!\n"); 1129 LOG (llevError, "Trying to insert freed object!\n");
1179 return NULL; 1130 return NULL;
1180 } 1131 }
1132
1133 if (!QUERY_FLAG (op, FLAG_REMOVED))
1134 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1135
1136 op->remove ();
1181 1137
1182 if (!m) 1138 if (!m)
1183 { 1139 {
1184 char *dump = dump_object (op); 1140 char *dump = dump_object (op);
1185 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1200#endif 1156#endif
1201 free (dump); 1157 free (dump);
1202 return op; 1158 return op;
1203 } 1159 }
1204 1160
1205 if (!QUERY_FLAG (op, FLAG_REMOVED))
1206 {
1207 char *dump = dump_object (op);
1208 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1209 free (dump);
1210 return op;
1211 }
1212
1213 if (op->more)
1214 {
1215 /* The part may be on a different map. */
1216
1217 object *more = op->more; 1161 if (object *more = op->more)
1218 1162 {
1219 /* We really need the caller to normalise coordinates - if
1220 * we set the map, that doesn't work if the location is within
1221 * a map and this is straddling an edge. So only if coordinate
1222 * is clear wrong do we normalise it.
1223 */
1224 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1225 more->map = get_map_from_coord (m, &more->x, &more->y);
1226 else if (!more->map)
1227 {
1228 /* For backwards compatibility - when not dealing with tiled maps,
1229 * more->map should always point to the parent.
1230 */
1231 more->map = m;
1232 }
1233
1234 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1163 if (!insert_ob_in_map (more, m, originator, flag))
1235 { 1164 {
1236 if (!op->head) 1165 if (!op->head)
1237 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1166 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1238 1167
1239 return 0; 1168 return 0;
… …
1244 1173
1245 /* Ideally, the caller figures this out. However, it complicates a lot 1174 /* Ideally, the caller figures this out. However, it complicates a lot
1246 * of areas of callers (eg, anything that uses find_free_spot would now 1175 * of areas of callers (eg, anything that uses find_free_spot would now
1247 * need extra work 1176 * need extra work
1248 */ 1177 */
1249 op->map = get_map_from_coord (m, &op->x, &op->y); 1178 if (!xy_normalise (m, op->x, op->y))
1250 x = op->x; 1179 return 0;
1251 y = op->y; 1180
1181 op->map = m;
1182 mapspace &ms = op->ms ();
1252 1183
1253 /* this has to be done after we translate the coordinates. 1184 /* this has to be done after we translate the coordinates.
1254 */ 1185 */
1255 if (op->nrof && !(flag & INS_NO_MERGE)) 1186 if (op->nrof && !(flag & INS_NO_MERGE))
1256 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1187 for (tmp = ms.bot; tmp; tmp = tmp->above)
1257 if (object::can_merge (op, tmp)) 1188 if (object::can_merge (op, tmp))
1258 { 1189 {
1259 op->nrof += tmp->nrof; 1190 op->nrof += tmp->nrof;
1260 tmp->destroy (); 1191 tmp->destroy ();
1261 } 1192 }
… …
1278 op->below = originator->below; 1209 op->below = originator->below;
1279 1210
1280 if (op->below) 1211 if (op->below)
1281 op->below->above = op; 1212 op->below->above = op;
1282 else 1213 else
1283 op->ms ().bot = op; 1214 ms.bot = op;
1284 1215
1285 /* since *below* originator, no need to update top */ 1216 /* since *below* originator, no need to update top */
1286 originator->below = op; 1217 originator->below = op;
1287 } 1218 }
1288 else 1219 else
1289 { 1220 {
1221 top = ms.bot;
1222
1290 /* If there are other objects, then */ 1223 /* If there are other objects, then */
1291 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1224 if ((!(flag & INS_MAP_LOAD)) && top)
1292 { 1225 {
1293 object *last = 0; 1226 object *last = 0;
1294 1227
1295 /* 1228 /*
1296 * If there are multiple objects on this space, we do some trickier handling. 1229 * If there are multiple objects on this space, we do some trickier handling.
… …
1302 * once we get to them. This reduces the need to traverse over all of 1235 * once we get to them. This reduces the need to traverse over all of
1303 * them when adding another one - this saves quite a bit of cpu time 1236 * them when adding another one - this saves quite a bit of cpu time
1304 * when lots of spells are cast in one area. Currently, it is presumed 1237 * when lots of spells are cast in one area. Currently, it is presumed
1305 * that flying non pickable objects are spell objects. 1238 * that flying non pickable objects are spell objects.
1306 */ 1239 */
1307 while (top) 1240 for (top = ms.bot; top; top = top->above)
1308 { 1241 {
1309 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1242 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1310 floor = top; 1243 floor = top;
1311 1244
1312 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1245 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1315 top = top->below; 1248 top = top->below;
1316 break; 1249 break;
1317 } 1250 }
1318 1251
1319 last = top; 1252 last = top;
1320 top = top->above;
1321 } 1253 }
1322 1254
1323 /* Don't want top to be NULL, so set it to the last valid object */ 1255 /* Don't want top to be NULL, so set it to the last valid object */
1324 top = last; 1256 top = last;
1325 1257
… …
1332 * Unless those objects are exits, type 66 1264 * Unless those objects are exits, type 66
1333 * If INS_ON_TOP is used, don't do this processing 1265 * If INS_ON_TOP is used, don't do this processing
1334 * Need to find the object that in fact blocks view, otherwise 1266 * Need to find the object that in fact blocks view, otherwise
1335 * stacking is a bit odd. 1267 * stacking is a bit odd.
1336 */ 1268 */
1337 if (!(flag & INS_ON_TOP) && 1269 if (!(flag & INS_ON_TOP)
1338 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1270 && ms.flags () & P_BLOCKSVIEW
1271 && (op->face && !op->face->visibility))
1339 { 1272 {
1340 for (last = top; last != floor; last = last->below) 1273 for (last = top; last != floor; last = last->below)
1341 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1274 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1342 break; 1275 break;
1276
1343 /* Check to see if we found the object that blocks view, 1277 /* Check to see if we found the object that blocks view,
1344 * and make sure we have a below pointer for it so that 1278 * and make sure we have a below pointer for it so that
1345 * we can get inserted below this one, which requires we 1279 * we can get inserted below this one, which requires we
1346 * set top to the object below us. 1280 * set top to the object below us.
1347 */ 1281 */
… …
1349 top = last->below; 1283 top = last->below;
1350 } 1284 }
1351 } /* If objects on this space */ 1285 } /* If objects on this space */
1352 1286
1353 if (flag & INS_MAP_LOAD) 1287 if (flag & INS_MAP_LOAD)
1354 top = GET_MAP_TOP (op->map, op->x, op->y); 1288 top = ms.top;
1355 1289
1356 if (flag & INS_ABOVE_FLOOR_ONLY) 1290 if (flag & INS_ABOVE_FLOOR_ONLY)
1357 top = floor; 1291 top = floor;
1358 1292
1359 /* Top is the object that our object (op) is going to get inserted above. 1293 /* Top is the object that our object (op) is going to get inserted above.
1360 */ 1294 */
1361 1295
1362 /* First object on this space */ 1296 /* First object on this space */
1363 if (!top) 1297 if (!top)
1364 { 1298 {
1365 op->above = GET_MAP_OB (op->map, op->x, op->y); 1299 op->above = ms.bot;
1366 1300
1367 if (op->above) 1301 if (op->above)
1368 op->above->below = op; 1302 op->above->below = op;
1369 1303
1370 op->below = 0; 1304 op->below = 0;
1371 op->ms ().bot = op; 1305 ms.bot = op;
1372 } 1306 }
1373 else 1307 else
1374 { /* get inserted into the stack above top */ 1308 { /* get inserted into the stack above top */
1375 op->above = top->above; 1309 op->above = top->above;
1376 1310
… …
1380 op->below = top; 1314 op->below = top;
1381 top->above = op; 1315 top->above = op;
1382 } 1316 }
1383 1317
1384 if (!op->above) 1318 if (!op->above)
1385 op->ms ().top = op; 1319 ms.top = op;
1386 } /* else not INS_BELOW_ORIGINATOR */ 1320 } /* else not INS_BELOW_ORIGINATOR */
1387 1321
1388 if (op->type == PLAYER) 1322 if (op->type == PLAYER)
1389 { 1323 {
1390 op->contr->do_los = 1; 1324 op->contr->do_los = 1;
… …
1396 1330
1397 /* If we have a floor, we know the player, if any, will be above 1331 /* If we have a floor, we know the player, if any, will be above
1398 * it, so save a few ticks and start from there. 1332 * it, so save a few ticks and start from there.
1399 */ 1333 */
1400 if (!(flag & INS_MAP_LOAD)) 1334 if (!(flag & INS_MAP_LOAD))
1401 if (object *pl = op->ms ().player ()) 1335 if (object *pl = ms.player ())
1402 if (pl->contr->ns) 1336 if (pl->contr->ns)
1403 pl->contr->ns->floorbox_update (); 1337 pl->contr->ns->floorbox_update ();
1404 1338
1405 /* If this object glows, it may affect lighting conditions that are 1339 /* If this object glows, it may affect lighting conditions that are
1406 * visible to others on this map. But update_all_los is really 1340 * visible to others on this map. But update_all_los is really
… …
1815 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1816 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1817 { 1751 {
1818 1752
1819 float 1753 float
1820 diff = tmp->move_slow_penalty * FABS (op->speed); 1754 diff = tmp->move_slow_penalty * fabs (op->speed);
1821 1755
1822 if (op->type == PLAYER) 1756 if (op->type == PLAYER)
1823 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1824 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1825 diff /= 4.0; 1759 diff /= 4.0;
… …
2207 2141
2208 return 3; 2142 return 3;
2209} 2143}
2210 2144
2211/* 2145/*
2212 * absdir(int): Returns a number between 1 and 8, which represent
2213 * the "absolute" direction of a number (it actually takes care of
2214 * "overflow" in previous calculations of a direction).
2215 */
2216
2217int
2218absdir (int d)
2219{
2220 while (d < 1)
2221 d += 8;
2222
2223 while (d > 8)
2224 d -= 8;
2225
2226 return d;
2227}
2228
2229/*
2230 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2146 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231 * between two directions (which are expected to be absolute (see absdir()) 2147 * between two directions (which are expected to be absolute (see absdir())
2232 */ 2148 */
2233
2234int 2149int
2235dirdiff (int dir1, int dir2) 2150dirdiff (int dir1, int dir2)
2236{ 2151{
2237 int d; 2152 int d;
2238 2153
… …
2654{ 2569{
2655 char flagdesc[512]; 2570 char flagdesc[512];
2656 char info2[256 * 4]; 2571 char info2[256 * 4];
2657 char *p = info; 2572 char *p = info;
2658 2573
2659 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2574 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2660 count, uuid.seq, 2575 count, uuid.seq,
2661 &name, 2576 &name,
2662 title ? "\",title:" : "", 2577 title ? "\",title:\"" : "",
2663 title ? (const char *)title : "", 2578 title ? (const char *)title : "",
2664 flag_desc (flagdesc, 512), type); 2579 flag_desc (flagdesc, 512), type);
2665 2580
2666 if (env) 2581 if (env)
2667 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2582 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2677{ 2592{
2678 static char info[256 * 4]; 2593 static char info[256 * 4];
2679 return debug_desc (info); 2594 return debug_desc (info);
2680} 2595}
2681 2596
2597const char *
2598object::debug_desc2 () const
2599{
2600 static char info[256 * 4];
2601 return debug_desc (info);
2602}
2603

Diff Legend

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