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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.129 by root, Wed Feb 7 02:13:06 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>
… …
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 unlink ();
676
677 free_key_values (this); 677 free_key_values (this);
678} 678}
679 679
680static int object_count; 680static int object_count;
681 681
… …
689 objects.insert (this); 689 objects.insert (this);
690} 690}
691 691
692void object::unlink () 692void object::unlink ()
693{ 693{
694 assert (index);//D 694 if (!index)
695 return;
696
695 objects.erase (this); 697 objects.erase (this);
696 refcnt_dec (); 698 refcnt_dec ();
697} 699}
698 700
699void 701void
… …
773 * drop on that space. 775 * drop on that space.
774 */ 776 */
775 if (!drop_to_ground 777 if (!drop_to_ground
776 || !map 778 || !map
777 || map->in_memory != MAP_IN_MEMORY 779 || map->in_memory != MAP_IN_MEMORY
780 || map->nodrop
778 || ms ().move_block == MOVE_ALL) 781 || ms ().move_block == MOVE_ALL)
779 { 782 {
780 while (inv) 783 while (inv)
781 { 784 {
782 inv->destroy_inv (drop_to_ground); 785 inv->destroy_inv (drop_to_ground);
… …
816 819
817 if (flag [FLAG_IS_LINKED]) 820 if (flag [FLAG_IS_LINKED])
818 remove_button_link (this); 821 remove_button_link (this);
819 822
820 if (flag [FLAG_FRIENDLY]) 823 if (flag [FLAG_FRIENDLY])
824 {
821 remove_friendly_object (this); 825 remove_friendly_object (this);
826
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
822 833
823 if (!flag [FLAG_REMOVED]) 834 if (!flag [FLAG_REMOVED])
824 remove (); 835 remove ();
825 836
826 destroy_inv (true); 837 destroy_inv (true);
… …
898 * This function removes the object op from the linked list of objects 909 * This function removes the object op from the linked list of objects
899 * which it is currently tied to. When this function is done, the 910 * which it is currently tied to. When this function is done, the
900 * object will have no environment. If the object previously had an 911 * object will have no environment. If the object previously had an
901 * environment, the x and y coordinates will be updated to 912 * environment, the x and y coordinates will be updated to
902 * the previous environment. 913 * the previous environment.
903 * Beware: This function is called from the editor as well!
904 */ 914 */
905void 915void
906object::remove () 916object::do_remove ()
907{ 917{
908 object *tmp, *last = 0; 918 object *tmp, *last = 0;
909 object *otmp; 919 object *otmp;
910 920
911 if (QUERY_FLAG (this, FLAG_REMOVED)) 921 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
959 --map->players; 969 --map->players;
960 map->touch (); 970 map->touch ();
961 } 971 }
962 972
963 map->dirty = true; 973 map->dirty = true;
974 mapspace &ms = this->ms ();
964 975
965 /* link the object above us */ 976 /* link the object above us */
966 if (above) 977 if (above)
967 above->below = below; 978 above->below = below;
968 else 979 else
969 map->at (x, y).top = below; /* we were top, set new top */ 980 ms.top = below; /* we were top, set new top */
970 981
971 /* Relink the object below us, if there is one */ 982 /* Relink the object below us, if there is one */
972 if (below) 983 if (below)
973 below->above = above; 984 below->above = above;
974 else 985 else
… …
976 /* Nothing below, which means we need to relink map object for this space 987 /* Nothing below, which means we need to relink map object for this space
977 * use translated coordinates in case some oddness with map tiling is 988 * use translated coordinates in case some oddness with map tiling is
978 * evident 989 * evident
979 */ 990 */
980 if (GET_MAP_OB (map, x, y) != this) 991 if (GET_MAP_OB (map, x, y) != this)
981 {
982 char *dump = dump_object (this);
983 LOG (llevError,
984 "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); 992 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 ());
985 free (dump);
986 dump = dump_object (GET_MAP_OB (map, x, y));
987 LOG (llevError, "%s\n", dump);
988 free (dump);
989 }
990 993
991 map->at (x, y).bot = above; /* goes on above it. */ 994 ms.bot = above; /* goes on above it. */
992 } 995 }
993 996
994 above = 0; 997 above = 0;
995 below = 0; 998 below = 0;
996 999
997 if (map->in_memory == MAP_SAVING) 1000 if (map->in_memory == MAP_SAVING)
998 return; 1001 return;
999 1002
1000 int check_walk_off = !flag [FLAG_NO_APPLY]; 1003 int check_walk_off = !flag [FLAG_NO_APPLY];
1001 1004
1002 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1005 for (tmp = ms.bot; tmp; tmp = tmp->above)
1003 { 1006 {
1004 /* No point updating the players look faces if he is the object 1007 /* No point updating the players look faces if he is the object
1005 * being removed. 1008 * being removed.
1006 */ 1009 */
1007 1010
… …
1088 1091
1089 return 0; 1092 return 0;
1090} 1093}
1091 1094
1092/* 1095/*
1093 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1096 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1094 * job preparing multi-part monsters 1097 * job preparing multi-part monsters.
1095 */ 1098 */
1096object * 1099object *
1097insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1100insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1098{ 1101{
1099 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1102 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1127 */ 1130 */
1128object * 1131object *
1129insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1132insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1130{ 1133{
1131 object *tmp, *top, *floor = NULL; 1134 object *tmp, *top, *floor = NULL;
1132 sint16 x, y;
1133 1135
1134 if (QUERY_FLAG (op, FLAG_FREED)) 1136 if (QUERY_FLAG (op, FLAG_FREED))
1135 { 1137 {
1136 LOG (llevError, "Trying to insert freed object!\n"); 1138 LOG (llevError, "Trying to insert freed object!\n");
1137 return NULL; 1139 return NULL;
1138 } 1140 }
1141
1142 if (!QUERY_FLAG (op, FLAG_REMOVED))
1143 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1144
1145 op->remove ();
1139 1146
1140 if (!m) 1147 if (!m)
1141 { 1148 {
1142 char *dump = dump_object (op); 1149 char *dump = dump_object (op);
1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1150 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1158#endif 1165#endif
1159 free (dump); 1166 free (dump);
1160 return op; 1167 return op;
1161 } 1168 }
1162 1169
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1167 free (dump);
1168 return op;
1169 }
1170
1171 if (op->more)
1172 {
1173 /* The part may be on a different map. */
1174
1175 object *more = op->more; 1170 if (object *more = op->more)
1176 1171 {
1177 /* We really need the caller to normalise coordinates - if
1178 * we set the map, that doesn't work if the location is within
1179 * a map and this is straddling an edge. So only if coordinate
1180 * is clear wrong do we normalise it.
1181 */
1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1184 else if (!more->map)
1185 {
1186 /* For backwards compatibility - when not dealing with tiled maps,
1187 * more->map should always point to the parent.
1188 */
1189 more->map = m;
1190 }
1191
1192 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1172 if (!insert_ob_in_map (more, m, originator, flag))
1193 { 1173 {
1194 if (!op->head) 1174 if (!op->head)
1195 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1175 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1196 1176
1197 return 0; 1177 return 0;
… …
1202 1182
1203 /* Ideally, the caller figures this out. However, it complicates a lot 1183 /* Ideally, the caller figures this out. However, it complicates a lot
1204 * of areas of callers (eg, anything that uses find_free_spot would now 1184 * of areas of callers (eg, anything that uses find_free_spot would now
1205 * need extra work 1185 * need extra work
1206 */ 1186 */
1207 op->map = get_map_from_coord (m, &op->x, &op->y); 1187 if (!xy_normalise (m, op->x, op->y))
1208 x = op->x; 1188 return 0;
1209 y = op->y; 1189
1190 op->map = m;
1191 mapspace &ms = op->ms ();
1210 1192
1211 /* this has to be done after we translate the coordinates. 1193 /* this has to be done after we translate the coordinates.
1212 */ 1194 */
1213 if (op->nrof && !(flag & INS_NO_MERGE)) 1195 if (op->nrof && !(flag & INS_NO_MERGE))
1214 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1196 for (tmp = ms.bot; tmp; tmp = tmp->above)
1215 if (object::can_merge (op, tmp)) 1197 if (object::can_merge (op, tmp))
1216 { 1198 {
1217 op->nrof += tmp->nrof; 1199 op->nrof += tmp->nrof;
1218 tmp->destroy (); 1200 tmp->destroy ();
1219 } 1201 }
… …
1236 op->below = originator->below; 1218 op->below = originator->below;
1237 1219
1238 if (op->below) 1220 if (op->below)
1239 op->below->above = op; 1221 op->below->above = op;
1240 else 1222 else
1241 op->ms ().bot = op; 1223 ms.bot = op;
1242 1224
1243 /* since *below* originator, no need to update top */ 1225 /* since *below* originator, no need to update top */
1244 originator->below = op; 1226 originator->below = op;
1245 } 1227 }
1246 else 1228 else
1247 { 1229 {
1230 top = ms.bot;
1231
1248 /* If there are other objects, then */ 1232 /* If there are other objects, then */
1249 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1233 if ((!(flag & INS_MAP_LOAD)) && top)
1250 { 1234 {
1251 object *last = 0; 1235 object *last = 0;
1252 1236
1253 /* 1237 /*
1254 * If there are multiple objects on this space, we do some trickier handling. 1238 * If there are multiple objects on this space, we do some trickier handling.
… …
1260 * once we get to them. This reduces the need to traverse over all of 1244 * once we get to them. This reduces the need to traverse over all of
1261 * them when adding another one - this saves quite a bit of cpu time 1245 * them when adding another one - this saves quite a bit of cpu time
1262 * when lots of spells are cast in one area. Currently, it is presumed 1246 * when lots of spells are cast in one area. Currently, it is presumed
1263 * that flying non pickable objects are spell objects. 1247 * that flying non pickable objects are spell objects.
1264 */ 1248 */
1265 while (top) 1249 for (top = ms.bot; top; top = top->above)
1266 { 1250 {
1267 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1251 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1268 floor = top; 1252 floor = top;
1269 1253
1270 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1254 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1273 top = top->below; 1257 top = top->below;
1274 break; 1258 break;
1275 } 1259 }
1276 1260
1277 last = top; 1261 last = top;
1278 top = top->above;
1279 } 1262 }
1280 1263
1281 /* Don't want top to be NULL, so set it to the last valid object */ 1264 /* Don't want top to be NULL, so set it to the last valid object */
1282 top = last; 1265 top = last;
1283 1266
… …
1290 * Unless those objects are exits, type 66 1273 * Unless those objects are exits, type 66
1291 * If INS_ON_TOP is used, don't do this processing 1274 * If INS_ON_TOP is used, don't do this processing
1292 * Need to find the object that in fact blocks view, otherwise 1275 * Need to find the object that in fact blocks view, otherwise
1293 * stacking is a bit odd. 1276 * stacking is a bit odd.
1294 */ 1277 */
1295 if (!(flag & INS_ON_TOP) && 1278 if (!(flag & INS_ON_TOP)
1296 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1279 && ms.flags () & P_BLOCKSVIEW
1280 && (op->face && !op->face->visibility))
1297 { 1281 {
1298 for (last = top; last != floor; last = last->below) 1282 for (last = top; last != floor; last = last->below)
1299 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1283 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1300 break; 1284 break;
1285
1301 /* Check to see if we found the object that blocks view, 1286 /* Check to see if we found the object that blocks view,
1302 * and make sure we have a below pointer for it so that 1287 * and make sure we have a below pointer for it so that
1303 * we can get inserted below this one, which requires we 1288 * we can get inserted below this one, which requires we
1304 * set top to the object below us. 1289 * set top to the object below us.
1305 */ 1290 */
… …
1307 top = last->below; 1292 top = last->below;
1308 } 1293 }
1309 } /* If objects on this space */ 1294 } /* If objects on this space */
1310 1295
1311 if (flag & INS_MAP_LOAD) 1296 if (flag & INS_MAP_LOAD)
1312 top = GET_MAP_TOP (op->map, op->x, op->y); 1297 top = ms.top;
1313 1298
1314 if (flag & INS_ABOVE_FLOOR_ONLY) 1299 if (flag & INS_ABOVE_FLOOR_ONLY)
1315 top = floor; 1300 top = floor;
1316 1301
1317 /* Top is the object that our object (op) is going to get inserted above. 1302 /* Top is the object that our object (op) is going to get inserted above.
1318 */ 1303 */
1319 1304
1320 /* First object on this space */ 1305 /* First object on this space */
1321 if (!top) 1306 if (!top)
1322 { 1307 {
1323 op->above = GET_MAP_OB (op->map, op->x, op->y); 1308 op->above = ms.bot;
1324 1309
1325 if (op->above) 1310 if (op->above)
1326 op->above->below = op; 1311 op->above->below = op;
1327 1312
1328 op->below = 0; 1313 op->below = 0;
1329 op->ms ().bot = op; 1314 ms.bot = op;
1330 } 1315 }
1331 else 1316 else
1332 { /* get inserted into the stack above top */ 1317 { /* get inserted into the stack above top */
1333 op->above = top->above; 1318 op->above = top->above;
1334 1319
… …
1338 op->below = top; 1323 op->below = top;
1339 top->above = op; 1324 top->above = op;
1340 } 1325 }
1341 1326
1342 if (!op->above) 1327 if (!op->above)
1343 op->ms ().top = op; 1328 ms.top = op;
1344 } /* else not INS_BELOW_ORIGINATOR */ 1329 } /* else not INS_BELOW_ORIGINATOR */
1345 1330
1346 if (op->type == PLAYER) 1331 if (op->type == PLAYER)
1347 { 1332 {
1348 op->contr->do_los = 1; 1333 op->contr->do_los = 1;
… …
1354 1339
1355 /* If we have a floor, we know the player, if any, will be above 1340 /* If we have a floor, we know the player, if any, will be above
1356 * it, so save a few ticks and start from there. 1341 * it, so save a few ticks and start from there.
1357 */ 1342 */
1358 if (!(flag & INS_MAP_LOAD)) 1343 if (!(flag & INS_MAP_LOAD))
1359 if (object *pl = op->ms ().player ()) 1344 if (object *pl = ms.player ())
1360 if (pl->contr->ns) 1345 if (pl->contr->ns)
1361 pl->contr->ns->floorbox_update (); 1346 pl->contr->ns->floorbox_update ();
1362 1347
1363 /* If this object glows, it may affect lighting conditions that are 1348 /* If this object glows, it may affect lighting conditions that are
1364 * visible to others on this map. But update_all_los is really 1349 * visible to others on this map. But update_all_los is really
… …
1773 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1758 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1774 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1759 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1775 { 1760 {
1776 1761
1777 float 1762 float
1778 diff = tmp->move_slow_penalty * FABS (op->speed); 1763 diff = tmp->move_slow_penalty * fabs (op->speed);
1779 1764
1780 if (op->type == PLAYER) 1765 if (op->type == PLAYER)
1781 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1766 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1782 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1767 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1783 diff /= 4.0; 1768 diff /= 4.0;
… …
1990 } 1975 }
1991 1976
1992 if (!index) 1977 if (!index)
1993 return -1; 1978 return -1;
1994 1979
1995 return altern[RANDOM () % index]; 1980 return altern [rndm (index)];
1996} 1981}
1997 1982
1998/* 1983/*
1999 * find_first_free_spot(archetype, maptile, x, y) works like 1984 * find_first_free_spot(archetype, maptile, x, y) works like
2000 * find_free_spot(), but it will search max number of squares. 1985 * find_free_spot(), but it will search max number of squares.
… …
2021{ 2006{
2022 arr += begin; 2007 arr += begin;
2023 end -= begin; 2008 end -= begin;
2024 2009
2025 while (--end) 2010 while (--end)
2026 swap (arr [end], arr [RANDOM () % (end + 1)]); 2011 swap (arr [end], arr [rndm (end + 1)]);
2027} 2012}
2028 2013
2029/* new function to make monster searching more efficient, and effective! 2014/* new function to make monster searching more efficient, and effective!
2030 * This basically returns a randomized array (in the passed pointer) of 2015 * This basically returns a randomized array (in the passed pointer) of
2031 * the spaces to find monsters. In this way, it won't always look for 2016 * the spaces to find monsters. In this way, it won't always look for
… …
2165 2150
2166 return 3; 2151 return 3;
2167} 2152}
2168 2153
2169/* 2154/*
2170 * absdir(int): Returns a number between 1 and 8, which represent
2171 * the "absolute" direction of a number (it actually takes care of
2172 * "overflow" in previous calculations of a direction).
2173 */
2174
2175int
2176absdir (int d)
2177{
2178 while (d < 1)
2179 d += 8;
2180
2181 while (d > 8)
2182 d -= 8;
2183
2184 return d;
2185}
2186
2187/*
2188 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2155 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2189 * between two directions (which are expected to be absolute (see absdir()) 2156 * between two directions (which are expected to be absolute (see absdir())
2190 */ 2157 */
2191
2192int 2158int
2193dirdiff (int dir1, int dir2) 2159dirdiff (int dir1, int dir2)
2194{ 2160{
2195 int d; 2161 int d;
2196 2162
… …
2612{ 2578{
2613 char flagdesc[512]; 2579 char flagdesc[512];
2614 char info2[256 * 4]; 2580 char info2[256 * 4];
2615 char *p = info; 2581 char *p = info;
2616 2582
2617 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2583 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2618 count, uuid.seq, 2584 count, uuid.seq,
2619 &name, 2585 &name,
2620 title ? "\",title:" : "", 2586 title ? "\",title:\"" : "",
2621 title ? (const char *)title : "", 2587 title ? (const char *)title : "",
2622 flag_desc (flagdesc, 512), type); 2588 flag_desc (flagdesc, 512), type);
2623 2589
2624 if (env) 2590 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2591 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2635{ 2601{
2636 static char info[256 * 4]; 2602 static char info[256 * 4];
2637 return debug_desc (info); 2603 return debug_desc (info);
2638} 2604}
2639 2605
2606const char *
2607object::debug_desc2 () const
2608{
2609 static char info[256 * 4];
2610 return debug_desc (info);
2611}
2612
2613struct region *
2614object::region () const
2615{
2616 return map ? map->region (x, y)
2617 : region::default_region ();
2618}
2619
2620const materialtype_t *
2621object::dominant_material () const
2622{
2623 if (materialtype_t *mat = name_to_material (materialname))
2624 return mat;
2625
2626 // omfg this is slow, this has to be temporary :)
2627 shstr unknown ("unknown");
2628
2629 return name_to_material (unknown);
2630}
2631

Diff Legend

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