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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.124 by root, Sat Jan 27 02:19:36 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>
… …
395 * 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.
396 */ 396 */
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 return ((unsigned int)i) < objects.size () 400 for_all_objects (op)
401 ? objects [i] 401 if (op->count == i)
402 : 0; 402 return op;
403
404 return 0;
403} 405}
404 406
405/* 407/*
406 * 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.
407 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
487 489
488 if (is_removed) 490 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED); 491 SET_FLAG (dst, FLAG_REMOVED);
490 492
491 if (speed < 0) 493 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 494 dst->speed_left = speed_left - rndm ();
493 495
494 /* Copy over key_values, if any. */ 496 /* Copy over key_values, if any. */
495 if (key_values) 497 if (key_values)
496 { 498 {
497 key_value *tail = 0; 499 key_value *tail = 0;
… …
658 660
659 if (op->more) 661 if (op->more)
660 update_object (op->more, action); 662 update_object (op->more, action);
661} 663}
662 664
663object *object::first;
664
665object::object () 665object::object ()
666{ 666{
667 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
668 668
669 expmul = 1.0; 669 expmul = 1.0;
670 face = blank_face; 670 face = blank_face;
671} 671}
672 672
673object::~object () 673object::~object ()
674{ 674{
675 unlink ();
676
675 free_key_values (this); 677 free_key_values (this);
676} 678}
677 679
680static int object_count;
681
678void object::link () 682void object::link ()
679{ 683{
684 assert (!index);//D
680 uuid = gen_uuid (); 685 uuid = gen_uuid ();
686 count = ++object_count;
681 687
682 refcnt_inc (); 688 refcnt_inc ();
683 objects.insert (this); 689 objects.insert (this);
684} 690}
685 691
686void object::unlink () 692void object::unlink ()
687{ 693{
694 if (!index)
695 return;
696
688 objects.erase (this); 697 objects.erase (this);
689 refcnt_dec (); 698 refcnt_dec ();
690} 699}
691 700
692void 701void
… …
766 * drop on that space. 775 * drop on that space.
767 */ 776 */
768 if (!drop_to_ground 777 if (!drop_to_ground
769 || !map 778 || !map
770 || map->in_memory != MAP_IN_MEMORY 779 || map->in_memory != MAP_IN_MEMORY
780 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 781 || ms ().move_block == MOVE_ALL)
772 { 782 {
773 while (inv) 783 while (inv)
774 { 784 {
775 inv->destroy_inv (drop_to_ground); 785 inv->destroy_inv (drop_to_ground);
… …
784 794
785 if (op->flag [FLAG_STARTEQUIP] 795 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 796 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 797 || op->type == RUNE
788 || op->type == TRAP 798 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 799 || op->flag [FLAG_IS_A_TEMPLATE]
800 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 801 op->destroy ();
791 else 802 else
792 map->insert (op, x, y); 803 map->insert (op, x, y);
793 } 804 }
794 } 805 }
… …
802} 813}
803 814
804void 815void
805object::do_destroy () 816object::do_destroy ()
806{ 817{
818 attachable::do_destroy ();
819
807 if (flag [FLAG_IS_LINKED]) 820 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 821 remove_button_link (this);
809 822
810 if (flag [FLAG_FRIENDLY]) 823 if (flag [FLAG_FRIENDLY])
811 remove_friendly_object (this); 824 remove_friendly_object (this);
812 825
813 if (!flag [FLAG_REMOVED]) 826 if (!flag [FLAG_REMOVED])
814 remove (); 827 remove ();
815 828
816 if (flag [FLAG_FREED]) 829 destroy_inv (true);
817 return;
818 830
819 set_speed (0); 831 deactivate ();
832 unlink ();
820 833
821 flag [FLAG_FREED] = 1; 834 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 835
828 // hack to ensure that freed objects still have a valid map 836 // hack to ensure that freed objects still have a valid map
829 { 837 {
830 static maptile *freed_map; // freed objects are moved here to avoid crashes 838 static maptile *freed_map; // freed objects are moved here to avoid crashes
831 839
… …
893 * This function removes the object op from the linked list of objects 901 * This function removes the object op from the linked list of objects
894 * which it is currently tied to. When this function is done, the 902 * which it is currently tied to. When this function is done, the
895 * object will have no environment. If the object previously had an 903 * object will have no environment. If the object previously had an
896 * environment, the x and y coordinates will be updated to 904 * environment, the x and y coordinates will be updated to
897 * the previous environment. 905 * the previous environment.
898 * Beware: This function is called from the editor as well!
899 */ 906 */
900void 907void
901object::remove () 908object::remove_slow ()
902{ 909{
903 object *tmp, *last = 0; 910 object *tmp, *last = 0;
904 object *otmp; 911 object *otmp;
905 912
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 913 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
954 --map->players; 961 --map->players;
955 map->touch (); 962 map->touch ();
956 } 963 }
957 964
958 map->dirty = true; 965 map->dirty = true;
966 mapspace &ms = this->ms ();
959 967
960 /* link the object above us */ 968 /* link the object above us */
961 if (above) 969 if (above)
962 above->below = below; 970 above->below = below;
963 else 971 else
964 map->at (x, y).top = below; /* we were top, set new top */ 972 ms.top = below; /* we were top, set new top */
965 973
966 /* Relink the object below us, if there is one */ 974 /* Relink the object below us, if there is one */
967 if (below) 975 if (below)
968 below->above = above; 976 below->above = above;
969 else 977 else
… …
971 /* Nothing below, which means we need to relink map object for this space 979 /* Nothing below, which means we need to relink map object for this space
972 * use translated coordinates in case some oddness with map tiling is 980 * use translated coordinates in case some oddness with map tiling is
973 * evident 981 * evident
974 */ 982 */
975 if (GET_MAP_OB (map, x, y) != this) 983 if (GET_MAP_OB (map, x, y) != this)
976 {
977 char *dump = dump_object (this);
978 LOG (llevError,
979 "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); 984 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 ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 985
986 map->at (x, y).bot = above; /* goes on above it. */ 986 ms.bot = above; /* goes on above it. */
987 } 987 }
988 988
989 above = 0; 989 above = 0;
990 below = 0; 990 below = 0;
991 991
992 if (map->in_memory == MAP_SAVING) 992 if (map->in_memory == MAP_SAVING)
993 return; 993 return;
994 994
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 995 int check_walk_off = !flag [FLAG_NO_APPLY];
996 996
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 997 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 998 {
999 /* No point updating the players look faces if he is the object 999 /* No point updating the players look faces if he is the object
1000 * being removed. 1000 * being removed.
1001 */ 1001 */
1002 1002
… …
1083 1083
1084 return 0; 1084 return 0;
1085} 1085}
1086 1086
1087/* 1087/*
1088 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1088 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1089 * job preparing multi-part monsters 1089 * job preparing multi-part monsters.
1090 */ 1090 */
1091object * 1091object *
1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093{ 1093{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1122 */ 1122 */
1123object * 1123object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1125{
1126 object *tmp, *top, *floor = NULL; 1126 object *tmp, *top, *floor = NULL;
1127 sint16 x, y;
1128 1127
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1128 if (QUERY_FLAG (op, FLAG_FREED))
1130 { 1129 {
1131 LOG (llevError, "Trying to insert freed object!\n"); 1130 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL; 1131 return NULL;
1133 } 1132 }
1133
1134 if (!QUERY_FLAG (op, FLAG_REMOVED))
1135 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1136
1137 op->remove ();
1134 1138
1135 if (!m) 1139 if (!m)
1136 { 1140 {
1137 char *dump = dump_object (op); 1141 char *dump = dump_object (op);
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1142 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1153#endif 1157#endif
1154 free (dump); 1158 free (dump);
1155 return op; 1159 return op;
1156 } 1160 }
1157 1161
1158 if (!QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1160 char *dump = dump_object (op);
1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162 free (dump);
1163 return op;
1164 }
1165
1166 if (op->more)
1167 {
1168 /* The part may be on a different map. */
1169
1170 object *more = op->more; 1162 if (object *more = op->more)
1171 1163 {
1172 /* We really need the caller to normalise coordinates - if
1173 * we set the map, that doesn't work if the location is within
1174 * a map and this is straddling an edge. So only if coordinate
1175 * is clear wrong do we normalise it.
1176 */
1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1179 else if (!more->map)
1180 {
1181 /* For backwards compatibility - when not dealing with tiled maps,
1182 * more->map should always point to the parent.
1183 */
1184 more->map = m;
1185 }
1186
1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1164 if (!insert_ob_in_map (more, m, originator, flag))
1188 { 1165 {
1189 if (!op->head) 1166 if (!op->head)
1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1167 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191 1168
1192 return 0; 1169 return 0;
… …
1197 1174
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1175 /* Ideally, the caller figures this out. However, it complicates a lot
1199 * of areas of callers (eg, anything that uses find_free_spot would now 1176 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1177 * need extra work
1201 */ 1178 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1179 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1180 return 0;
1204 y = op->y; 1181
1182 op->map = m;
1183 mapspace &ms = op->ms ();
1205 1184
1206 /* this has to be done after we translate the coordinates. 1185 /* this has to be done after we translate the coordinates.
1207 */ 1186 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1187 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1188 for (tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1189 if (object::can_merge (op, tmp))
1211 { 1190 {
1212 op->nrof += tmp->nrof; 1191 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1192 tmp->destroy ();
1214 } 1193 }
… …
1231 op->below = originator->below; 1210 op->below = originator->below;
1232 1211
1233 if (op->below) 1212 if (op->below)
1234 op->below->above = op; 1213 op->below->above = op;
1235 else 1214 else
1236 op->ms ().bot = op; 1215 ms.bot = op;
1237 1216
1238 /* since *below* originator, no need to update top */ 1217 /* since *below* originator, no need to update top */
1239 originator->below = op; 1218 originator->below = op;
1240 } 1219 }
1241 else 1220 else
1242 { 1221 {
1222 top = ms.bot;
1223
1243 /* If there are other objects, then */ 1224 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1225 if ((!(flag & INS_MAP_LOAD)) && top)
1245 { 1226 {
1246 object *last = 0; 1227 object *last = 0;
1247 1228
1248 /* 1229 /*
1249 * If there are multiple objects on this space, we do some trickier handling. 1230 * If there are multiple objects on this space, we do some trickier handling.
… …
1255 * once we get to them. This reduces the need to traverse over all of 1236 * once we get to them. This reduces the need to traverse over all of
1256 * them when adding another one - this saves quite a bit of cpu time 1237 * them when adding another one - this saves quite a bit of cpu time
1257 * when lots of spells are cast in one area. Currently, it is presumed 1238 * when lots of spells are cast in one area. Currently, it is presumed
1258 * that flying non pickable objects are spell objects. 1239 * that flying non pickable objects are spell objects.
1259 */ 1240 */
1260 while (top) 1241 for (top = ms.bot; top; top = top->above)
1261 { 1242 {
1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1243 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263 floor = top; 1244 floor = top;
1264 1245
1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1246 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1268 top = top->below; 1249 top = top->below;
1269 break; 1250 break;
1270 } 1251 }
1271 1252
1272 last = top; 1253 last = top;
1273 top = top->above;
1274 } 1254 }
1275 1255
1276 /* Don't want top to be NULL, so set it to the last valid object */ 1256 /* Don't want top to be NULL, so set it to the last valid object */
1277 top = last; 1257 top = last;
1278 1258
… …
1285 * Unless those objects are exits, type 66 1265 * Unless those objects are exits, type 66
1286 * If INS_ON_TOP is used, don't do this processing 1266 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1267 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1268 * stacking is a bit odd.
1289 */ 1269 */
1290 if (!(flag & INS_ON_TOP) && 1270 if (!(flag & INS_ON_TOP)
1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1271 && ms.flags () & P_BLOCKSVIEW
1272 && (op->face && !op->face->visibility))
1292 { 1273 {
1293 for (last = top; last != floor; last = last->below) 1274 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1275 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1276 break;
1277
1296 /* Check to see if we found the object that blocks view, 1278 /* Check to see if we found the object that blocks view,
1297 * and make sure we have a below pointer for it so that 1279 * and make sure we have a below pointer for it so that
1298 * we can get inserted below this one, which requires we 1280 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1281 * set top to the object below us.
1300 */ 1282 */
… …
1302 top = last->below; 1284 top = last->below;
1303 } 1285 }
1304 } /* If objects on this space */ 1286 } /* If objects on this space */
1305 1287
1306 if (flag & INS_MAP_LOAD) 1288 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y); 1289 top = ms.top;
1308 1290
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1291 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1292 top = floor;
1311 1293
1312 /* Top is the object that our object (op) is going to get inserted above. 1294 /* Top is the object that our object (op) is going to get inserted above.
1313 */ 1295 */
1314 1296
1315 /* First object on this space */ 1297 /* First object on this space */
1316 if (!top) 1298 if (!top)
1317 { 1299 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1300 op->above = ms.bot;
1319 1301
1320 if (op->above) 1302 if (op->above)
1321 op->above->below = op; 1303 op->above->below = op;
1322 1304
1323 op->below = 0; 1305 op->below = 0;
1324 op->ms ().bot = op; 1306 ms.bot = op;
1325 } 1307 }
1326 else 1308 else
1327 { /* get inserted into the stack above top */ 1309 { /* get inserted into the stack above top */
1328 op->above = top->above; 1310 op->above = top->above;
1329 1311
… …
1333 op->below = top; 1315 op->below = top;
1334 top->above = op; 1316 top->above = op;
1335 } 1317 }
1336 1318
1337 if (!op->above) 1319 if (!op->above)
1338 op->ms ().top = op; 1320 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1321 } /* else not INS_BELOW_ORIGINATOR */
1340 1322
1341 if (op->type == PLAYER) 1323 if (op->type == PLAYER)
1342 { 1324 {
1343 op->contr->do_los = 1; 1325 op->contr->do_los = 1;
… …
1349 1331
1350 /* If we have a floor, we know the player, if any, will be above 1332 /* If we have a floor, we know the player, if any, will be above
1351 * it, so save a few ticks and start from there. 1333 * it, so save a few ticks and start from there.
1352 */ 1334 */
1353 if (!(flag & INS_MAP_LOAD)) 1335 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1336 if (object *pl = ms.player ())
1355 if (pl->contr->ns) 1337 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1338 pl->contr->ns->floorbox_update ();
1357 1339
1358 /* If this object glows, it may affect lighting conditions that are 1340 /* If this object glows, it may affect lighting conditions that are
1359 * visible to others on this map. But update_all_los is really 1341 * visible to others on this map. But update_all_los is really
… …
1768 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1750 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1751 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770 { 1752 {
1771 1753
1772 float 1754 float
1773 diff = tmp->move_slow_penalty * FABS (op->speed); 1755 diff = tmp->move_slow_penalty * fabs (op->speed);
1774 1756
1775 if (op->type == PLAYER) 1757 if (op->type == PLAYER)
1776 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1758 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1777 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1759 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1778 diff /= 4.0; 1760 diff /= 4.0;
… …
1985 } 1967 }
1986 1968
1987 if (!index) 1969 if (!index)
1988 return -1; 1970 return -1;
1989 1971
1990 return altern[RANDOM () % index]; 1972 return altern [rndm (index)];
1991} 1973}
1992 1974
1993/* 1975/*
1994 * find_first_free_spot(archetype, maptile, x, y) works like 1976 * find_first_free_spot(archetype, maptile, x, y) works like
1995 * find_free_spot(), but it will search max number of squares. 1977 * find_free_spot(), but it will search max number of squares.
… …
2016{ 1998{
2017 arr += begin; 1999 arr += begin;
2018 end -= begin; 2000 end -= begin;
2019 2001
2020 while (--end) 2002 while (--end)
2021 swap (arr [end], arr [RANDOM () % (end + 1)]); 2003 swap (arr [end], arr [rndm (end + 1)]);
2022} 2004}
2023 2005
2024/* new function to make monster searching more efficient, and effective! 2006/* new function to make monster searching more efficient, and effective!
2025 * This basically returns a randomized array (in the passed pointer) of 2007 * This basically returns a randomized array (in the passed pointer) of
2026 * the spaces to find monsters. In this way, it won't always look for 2008 * the spaces to find monsters. In this way, it won't always look for
… …
2160 2142
2161 return 3; 2143 return 3;
2162} 2144}
2163 2145
2164/* 2146/*
2165 * absdir(int): Returns a number between 1 and 8, which represent
2166 * the "absolute" direction of a number (it actually takes care of
2167 * "overflow" in previous calculations of a direction).
2168 */
2169
2170int
2171absdir (int d)
2172{
2173 while (d < 1)
2174 d += 8;
2175
2176 while (d > 8)
2177 d -= 8;
2178
2179 return d;
2180}
2181
2182/*
2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2147 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2148 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2149 */
2186
2187int 2150int
2188dirdiff (int dir1, int dir2) 2151dirdiff (int dir1, int dir2)
2189{ 2152{
2190 int d; 2153 int d;
2191 2154
… …
2607{ 2570{
2608 char flagdesc[512]; 2571 char flagdesc[512];
2609 char info2[256 * 4]; 2572 char info2[256 * 4];
2610 char *p = info; 2573 char *p = info;
2611 2574
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2575 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2576 count, uuid.seq,
2614 &name, 2577 &name,
2615 title ? "\",title:" : "", 2578 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2579 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2580 flag_desc (flagdesc, 512), type);
2618 2581
2619 if (env) 2582 if (env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2583 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2630{ 2593{
2631 static char info[256 * 4]; 2594 static char info[256 * 4];
2632 return debug_desc (info); 2595 return debug_desc (info);
2633} 2596}
2634 2597
2598const char *
2599object::debug_desc2 () const
2600{
2601 static char info[256 * 4];
2602 return debug_desc (info);
2603}
2604

Diff Legend

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