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.110 by root, Sun Jan 7 23:12:03 2007 UTC vs.
Revision 1.132 by root, Sat Feb 10 21:01:09 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 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);
… …
803} 813}
804 814
805void 815void
806object::do_destroy () 816object::do_destroy ()
807{ 817{
818 attachable::do_destroy ();
819
808 if (flag [FLAG_IS_LINKED]) 820 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this); 821 remove_button_link (this);
810 822
811 if (flag [FLAG_FRIENDLY]) 823 if (flag [FLAG_FRIENDLY])
824 {
812 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 }
813 833
814 if (!flag [FLAG_REMOVED]) 834 if (!flag [FLAG_REMOVED])
815 remove (); 835 remove ();
816 836
817 if (flag [FLAG_FREED]) 837 destroy_inv (true);
818 return;
819 838
820 set_speed (0); 839 deactivate ();
840 unlink ();
821 841
822 flag [FLAG_FREED] = 1; 842 flag [FLAG_FREED] = 1;
823
824 attachable::do_destroy ();
825
826 destroy_inv (true);
827 unlink ();
828 843
829 // hack to ensure that freed objects still have a valid map 844 // hack to ensure that freed objects still have a valid map
830 { 845 {
831 static maptile *freed_map; // freed objects are moved here to avoid crashes 846 static maptile *freed_map; // freed objects are moved here to avoid crashes
832 847
… …
894 * 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
895 * 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
896 * object will have no environment. If the object previously had an 911 * object will have no environment. If the object previously had an
897 * environment, the x and y coordinates will be updated to 912 * environment, the x and y coordinates will be updated to
898 * the previous environment. 913 * the previous environment.
899 * Beware: This function is called from the editor as well!
900 */ 914 */
901void 915void
902object::remove () 916object::do_remove ()
903{ 917{
904 object *tmp, *last = 0; 918 object *tmp, *last = 0;
905 object *otmp; 919 object *otmp;
906 920
907 if (QUERY_FLAG (this, FLAG_REMOVED)) 921 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
950 } 964 }
951 else if (map) 965 else if (map)
952 { 966 {
953 if (type == PLAYER) 967 if (type == PLAYER)
954 { 968 {
969 // leaving a spot always closes any open container on the ground
970 if (container && !container->env)
971 // this causes spurious floorbox updates, but it ensures
972 // that the CLOSE event is being sent.
973 close_container ();
974
955 --map->players; 975 --map->players;
956 map->touch (); 976 map->touch ();
957 } 977 }
958 978
959 map->dirty = true; 979 map->dirty = true;
980 mapspace &ms = this->ms ();
960 981
961 /* link the object above us */ 982 /* link the object above us */
962 if (above) 983 if (above)
963 above->below = below; 984 above->below = below;
964 else 985 else
965 map->at (x, y).top = below; /* we were top, set new top */ 986 ms.top = below; /* we were top, set new top */
966 987
967 /* Relink the object below us, if there is one */ 988 /* Relink the object below us, if there is one */
968 if (below) 989 if (below)
969 below->above = above; 990 below->above = above;
970 else 991 else
… …
972 /* Nothing below, which means we need to relink map object for this space 993 /* Nothing below, which means we need to relink map object for this space
973 * use translated coordinates in case some oddness with map tiling is 994 * use translated coordinates in case some oddness with map tiling is
974 * evident 995 * evident
975 */ 996 */
976 if (GET_MAP_OB (map, x, y) != this) 997 if (GET_MAP_OB (map, x, y) != this)
977 {
978 char *dump = dump_object (this);
979 LOG (llevError,
980 "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); 998 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 ());
981 free (dump);
982 dump = dump_object (GET_MAP_OB (map, x, y));
983 LOG (llevError, "%s\n", dump);
984 free (dump);
985 }
986 999
987 map->at (x, y).bot = above; /* goes on above it. */ 1000 ms.bot = above; /* goes on above it. */
988 } 1001 }
989 1002
990 above = 0; 1003 above = 0;
991 below = 0; 1004 below = 0;
992 1005
993 if (map->in_memory == MAP_SAVING) 1006 if (map->in_memory == MAP_SAVING)
994 return; 1007 return;
995 1008
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 1009 int check_walk_off = !flag [FLAG_NO_APPLY];
997 1010
998 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1011 for (tmp = ms.bot; tmp; tmp = tmp->above)
999 { 1012 {
1000 /* No point updating the players look faces if he is the object 1013 /* No point updating the players look faces if he is the object
1001 * being removed. 1014 * being removed.
1002 */ 1015 */
1003 1016
… …
1084 1097
1085 return 0; 1098 return 0;
1086} 1099}
1087 1100
1088/* 1101/*
1089 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1102 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters 1103 * job preparing multi-part monsters.
1091 */ 1104 */
1092object * 1105object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1106insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1107{
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1108 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1123 */ 1136 */
1124object * 1137object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1138insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1139{
1127 object *tmp, *top, *floor = NULL; 1140 object *tmp, *top, *floor = NULL;
1128 sint16 x, y;
1129 1141
1130 if (QUERY_FLAG (op, FLAG_FREED)) 1142 if (QUERY_FLAG (op, FLAG_FREED))
1131 { 1143 {
1132 LOG (llevError, "Trying to insert freed object!\n"); 1144 LOG (llevError, "Trying to insert freed object!\n");
1133 return NULL; 1145 return NULL;
1134 } 1146 }
1147
1148 if (!QUERY_FLAG (op, FLAG_REMOVED))
1149 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1150
1151 op->remove ();
1135 1152
1136 if (!m) 1153 if (!m)
1137 { 1154 {
1138 char *dump = dump_object (op); 1155 char *dump = dump_object (op);
1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1156 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1154#endif 1171#endif
1155 free (dump); 1172 free (dump);
1156 return op; 1173 return op;
1157 } 1174 }
1158 1175
1159 if (!QUERY_FLAG (op, FLAG_REMOVED))
1160 {
1161 char *dump = dump_object (op);
1162 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1163 free (dump);
1164 return op;
1165 }
1166
1167 if (op->more)
1168 {
1169 /* The part may be on a different map. */
1170
1171 object *more = op->more; 1176 if (object *more = op->more)
1172 1177 {
1173 /* We really need the caller to normalise coordinates - if
1174 * we set the map, that doesn't work if the location is within
1175 * a map and this is straddling an edge. So only if coordinate
1176 * is clear wrong do we normalise it.
1177 */
1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1180 else if (!more->map)
1181 {
1182 /* For backwards compatibility - when not dealing with tiled maps,
1183 * more->map should always point to the parent.
1184 */
1185 more->map = m;
1186 }
1187
1188 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1178 if (!insert_ob_in_map (more, m, originator, flag))
1189 { 1179 {
1190 if (!op->head) 1180 if (!op->head)
1191 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1181 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1192 1182
1193 return 0; 1183 return 0;
… …
1198 1188
1199 /* Ideally, the caller figures this out. However, it complicates a lot 1189 /* Ideally, the caller figures this out. However, it complicates a lot
1200 * of areas of callers (eg, anything that uses find_free_spot would now 1190 * of areas of callers (eg, anything that uses find_free_spot would now
1201 * need extra work 1191 * need extra work
1202 */ 1192 */
1203 op->map = get_map_from_coord (m, &op->x, &op->y); 1193 if (!xy_normalise (m, op->x, op->y))
1204 x = op->x; 1194 return 0;
1205 y = op->y; 1195
1196 op->map = m;
1197 mapspace &ms = op->ms ();
1206 1198
1207 /* this has to be done after we translate the coordinates. 1199 /* this has to be done after we translate the coordinates.
1208 */ 1200 */
1209 if (op->nrof && !(flag & INS_NO_MERGE)) 1201 if (op->nrof && !(flag & INS_NO_MERGE))
1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1202 for (tmp = ms.bot; tmp; tmp = tmp->above)
1211 if (object::can_merge (op, tmp)) 1203 if (object::can_merge (op, tmp))
1212 { 1204 {
1213 op->nrof += tmp->nrof; 1205 op->nrof += tmp->nrof;
1214 tmp->destroy (); 1206 tmp->destroy ();
1215 } 1207 }
… …
1232 op->below = originator->below; 1224 op->below = originator->below;
1233 1225
1234 if (op->below) 1226 if (op->below)
1235 op->below->above = op; 1227 op->below->above = op;
1236 else 1228 else
1237 op->ms ().bot = op; 1229 ms.bot = op;
1238 1230
1239 /* since *below* originator, no need to update top */ 1231 /* since *below* originator, no need to update top */
1240 originator->below = op; 1232 originator->below = op;
1241 } 1233 }
1242 else 1234 else
1243 { 1235 {
1236 top = ms.bot;
1237
1244 /* If there are other objects, then */ 1238 /* If there are other objects, then */
1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1239 if ((!(flag & INS_MAP_LOAD)) && top)
1246 { 1240 {
1247 object *last = 0; 1241 object *last = 0;
1248 1242
1249 /* 1243 /*
1250 * If there are multiple objects on this space, we do some trickier handling. 1244 * If there are multiple objects on this space, we do some trickier handling.
… …
1256 * once we get to them. This reduces the need to traverse over all of 1250 * once we get to them. This reduces the need to traverse over all of
1257 * them when adding another one - this saves quite a bit of cpu time 1251 * them when adding another one - this saves quite a bit of cpu time
1258 * when lots of spells are cast in one area. Currently, it is presumed 1252 * when lots of spells are cast in one area. Currently, it is presumed
1259 * that flying non pickable objects are spell objects. 1253 * that flying non pickable objects are spell objects.
1260 */ 1254 */
1261 while (top) 1255 for (top = ms.bot; top; top = top->above)
1262 { 1256 {
1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1257 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1264 floor = top; 1258 floor = top;
1265 1259
1266 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1260 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1269 top = top->below; 1263 top = top->below;
1270 break; 1264 break;
1271 } 1265 }
1272 1266
1273 last = top; 1267 last = top;
1274 top = top->above;
1275 } 1268 }
1276 1269
1277 /* Don't want top to be NULL, so set it to the last valid object */ 1270 /* Don't want top to be NULL, so set it to the last valid object */
1278 top = last; 1271 top = last;
1279 1272
… …
1286 * Unless those objects are exits, type 66 1279 * Unless those objects are exits, type 66
1287 * If INS_ON_TOP is used, don't do this processing 1280 * If INS_ON_TOP is used, don't do this processing
1288 * Need to find the object that in fact blocks view, otherwise 1281 * Need to find the object that in fact blocks view, otherwise
1289 * stacking is a bit odd. 1282 * stacking is a bit odd.
1290 */ 1283 */
1291 if (!(flag & INS_ON_TOP) && 1284 if (!(flag & INS_ON_TOP)
1292 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1285 && ms.flags () & P_BLOCKSVIEW
1286 && (op->face && !op->face->visibility))
1293 { 1287 {
1294 for (last = top; last != floor; last = last->below) 1288 for (last = top; last != floor; last = last->below)
1295 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1289 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1296 break; 1290 break;
1291
1297 /* Check to see if we found the object that blocks view, 1292 /* Check to see if we found the object that blocks view,
1298 * and make sure we have a below pointer for it so that 1293 * and make sure we have a below pointer for it so that
1299 * we can get inserted below this one, which requires we 1294 * we can get inserted below this one, which requires we
1300 * set top to the object below us. 1295 * set top to the object below us.
1301 */ 1296 */
… …
1303 top = last->below; 1298 top = last->below;
1304 } 1299 }
1305 } /* If objects on this space */ 1300 } /* If objects on this space */
1306 1301
1307 if (flag & INS_MAP_LOAD) 1302 if (flag & INS_MAP_LOAD)
1308 top = GET_MAP_TOP (op->map, op->x, op->y); 1303 top = ms.top;
1309 1304
1310 if (flag & INS_ABOVE_FLOOR_ONLY) 1305 if (flag & INS_ABOVE_FLOOR_ONLY)
1311 top = floor; 1306 top = floor;
1312 1307
1313 /* Top is the object that our object (op) is going to get inserted above. 1308 /* Top is the object that our object (op) is going to get inserted above.
1314 */ 1309 */
1315 1310
1316 /* First object on this space */ 1311 /* First object on this space */
1317 if (!top) 1312 if (!top)
1318 { 1313 {
1319 op->above = GET_MAP_OB (op->map, op->x, op->y); 1314 op->above = ms.bot;
1320 1315
1321 if (op->above) 1316 if (op->above)
1322 op->above->below = op; 1317 op->above->below = op;
1323 1318
1324 op->below = 0; 1319 op->below = 0;
1325 op->ms ().bot = op; 1320 ms.bot = op;
1326 } 1321 }
1327 else 1322 else
1328 { /* get inserted into the stack above top */ 1323 { /* get inserted into the stack above top */
1329 op->above = top->above; 1324 op->above = top->above;
1330 1325
… …
1334 op->below = top; 1329 op->below = top;
1335 top->above = op; 1330 top->above = op;
1336 } 1331 }
1337 1332
1338 if (!op->above) 1333 if (!op->above)
1339 op->ms ().top = op; 1334 ms.top = op;
1340 } /* else not INS_BELOW_ORIGINATOR */ 1335 } /* else not INS_BELOW_ORIGINATOR */
1341 1336
1342 if (op->type == PLAYER) 1337 if (op->type == PLAYER)
1343 { 1338 {
1344 op->contr->do_los = 1; 1339 op->contr->do_los = 1;
… …
1350 1345
1351 /* If we have a floor, we know the player, if any, will be above 1346 /* If we have a floor, we know the player, if any, will be above
1352 * it, so save a few ticks and start from there. 1347 * it, so save a few ticks and start from there.
1353 */ 1348 */
1354 if (!(flag & INS_MAP_LOAD)) 1349 if (!(flag & INS_MAP_LOAD))
1355 if (object *pl = op->ms ().player ()) 1350 if (object *pl = ms.player ())
1356 if (pl->contr->ns) 1351 if (pl->contr->ns)
1357 pl->contr->ns->floorbox_update (); 1352 pl->contr->ns->floorbox_update ();
1358 1353
1359 /* If this object glows, it may affect lighting conditions that are 1354 /* If this object glows, it may affect lighting conditions that are
1360 * visible to others on this map. But update_all_los is really 1355 * visible to others on this map. But update_all_los is really
… …
1769 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1764 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1770 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1765 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1771 { 1766 {
1772 1767
1773 float 1768 float
1774 diff = tmp->move_slow_penalty * FABS (op->speed); 1769 diff = tmp->move_slow_penalty * fabs (op->speed);
1775 1770
1776 if (op->type == PLAYER) 1771 if (op->type == PLAYER)
1777 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1772 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1778 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1773 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1779 diff /= 4.0; 1774 diff /= 4.0;
… …
1986 } 1981 }
1987 1982
1988 if (!index) 1983 if (!index)
1989 return -1; 1984 return -1;
1990 1985
1991 return altern[RANDOM () % index]; 1986 return altern [rndm (index)];
1992} 1987}
1993 1988
1994/* 1989/*
1995 * find_first_free_spot(archetype, maptile, x, y) works like 1990 * find_first_free_spot(archetype, maptile, x, y) works like
1996 * find_free_spot(), but it will search max number of squares. 1991 * find_free_spot(), but it will search max number of squares.
… …
2017{ 2012{
2018 arr += begin; 2013 arr += begin;
2019 end -= begin; 2014 end -= begin;
2020 2015
2021 while (--end) 2016 while (--end)
2022 swap (arr [end], arr [RANDOM () % (end + 1)]); 2017 swap (arr [end], arr [rndm (end + 1)]);
2023} 2018}
2024 2019
2025/* new function to make monster searching more efficient, and effective! 2020/* new function to make monster searching more efficient, and effective!
2026 * This basically returns a randomized array (in the passed pointer) of 2021 * This basically returns a randomized array (in the passed pointer) of
2027 * the spaces to find monsters. In this way, it won't always look for 2022 * the spaces to find monsters. In this way, it won't always look for
… …
2161 2156
2162 return 3; 2157 return 3;
2163} 2158}
2164 2159
2165/* 2160/*
2166 * absdir(int): Returns a number between 1 and 8, which represent
2167 * the "absolute" direction of a number (it actually takes care of
2168 * "overflow" in previous calculations of a direction).
2169 */
2170
2171int
2172absdir (int d)
2173{
2174 while (d < 1)
2175 d += 8;
2176
2177 while (d > 8)
2178 d -= 8;
2179
2180 return d;
2181}
2182
2183/*
2184 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2161 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2185 * between two directions (which are expected to be absolute (see absdir()) 2162 * between two directions (which are expected to be absolute (see absdir())
2186 */ 2163 */
2187
2188int 2164int
2189dirdiff (int dir1, int dir2) 2165dirdiff (int dir1, int dir2)
2190{ 2166{
2191 int d; 2167 int d;
2192 2168
… …
2608{ 2584{
2609 char flagdesc[512]; 2585 char flagdesc[512];
2610 char info2[256 * 4]; 2586 char info2[256 * 4];
2611 char *p = info; 2587 char *p = info;
2612 2588
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2589 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2590 count, uuid.seq,
2615 &name, 2591 &name,
2616 title ? "\",title:" : "", 2592 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2593 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2594 flag_desc (flagdesc, 512), type);
2619 2595
2620 if (env) 2596 if (env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2597 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2631{ 2607{
2632 static char info[256 * 4]; 2608 static char info[256 * 4];
2633 return debug_desc (info); 2609 return debug_desc (info);
2634} 2610}
2635 2611
2612const char *
2613object::debug_desc2 () const
2614{
2615 static char info[256 * 4];
2616 return debug_desc (info);
2617}
2618
2619struct region *
2620object::region () const
2621{
2622 return map ? map->region (x, y)
2623 : region::default_region ();
2624}
2625
2626const materialtype_t *
2627object::dominant_material () const
2628{
2629 if (materialtype_t *mat = name_to_material (materialname))
2630 return mat;
2631
2632 // omfg this is slow, this has to be temporary :)
2633 shstr unknown ("unknown");
2634
2635 return name_to_material (unknown);
2636}
2637
2638void
2639object::open_container (object *new_container)
2640{
2641 if (container == new_container)
2642 return;
2643
2644 if (object *old_container = container)
2645 {
2646 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2647 return;
2648
2649#if 0
2650 // remove the "Close old_container" object.
2651 if (object *closer = old_container->inv)
2652 if (closer->type == CLOSE_CON)
2653 closer->destroy ();
2654#endif
2655
2656 old_container->flag [FLAG_APPLIED] = 0;
2657 container = 0;
2658
2659 esrv_update_item (UPD_FLAGS, this, old_container);
2660 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2661 }
2662
2663 if (new_container)
2664 {
2665 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2666 return;
2667
2668 // TODO: this does not seem to serve any purpose anymore?
2669#if 0
2670 // insert the "Close Container" object.
2671 if (archetype *closer = new_container->other_arch)
2672 {
2673 object *closer = arch_to_object (new_container->other_arch);
2674 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2675 new_container->insert (closer);
2676 }
2677#endif
2678
2679 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2680
2681 new_container->flag [FLAG_APPLIED] = 1;
2682 container = new_container;
2683
2684 esrv_update_item (UPD_FLAGS, this, new_container);
2685 esrv_send_inventory (this, new_container);
2686 }
2687}
2688
2689

Diff Legend

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