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.115 by root, Mon Jan 15 01:39:42 2007 UTC vs.
Revision 1.136 by root, Thu Mar 15 14:23:02 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>
… …
357/* 357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
361 */ 361 */
362
363char * 362char *
364dump_object (object *op) 363dump_object (object *op)
365{ 364{
366 if (!op) 365 if (!op)
367 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
368 367
369 object_freezer freezer; 368 object_freezer freezer;
370 save_object (freezer, op, 1); 369 op->write (freezer);
371 return freezer.as_string (); 370 return freezer.as_string ();
372} 371}
373 372
374/* 373/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
489 488
490 if (is_removed) 489 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED); 490 SET_FLAG (dst, FLAG_REMOVED);
492 491
493 if (speed < 0) 492 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 493 dst->speed_left = speed_left - rndm ();
495 494
496 /* Copy over key_values, if any. */ 495 /* Copy over key_values, if any. */
497 if (key_values) 496 if (key_values)
498 { 497 {
499 key_value *tail = 0; 498 key_value *tail = 0;
… …
522 } 521 }
523 } 522 }
524 } 523 }
525 524
526 dst->set_speed (dst->speed); 525 dst->set_speed (dst->speed);
526}
527
528void
529object::instantiate ()
530{
531 if (!uuid.seq) // HACK
532 uuid = gen_uuid ();
533
534 speed_left = -0.1f;
535 /* copy the body_info to the body_used - this is only really
536 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped.
540 */
541 memcpy (body_used, body_info, sizeof (body_used));
542
543 attachable::instantiate ();
527} 544}
528 545
529object * 546object *
530object::clone () 547object::clone ()
531{ 548{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 606 * UP_OBJ_FACE: only the objects face has changed.
590 */ 607 */
591void 608void
592update_object (object *op, int action) 609update_object (object *op, int action)
593{ 610{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 611 if (op == NULL)
597 { 612 {
598 /* this should never happen */ 613 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 614 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 615 return;
… …
670 face = blank_face; 685 face = blank_face;
671} 686}
672 687
673object::~object () 688object::~object ()
674{ 689{
690 unlink ();
691
675 free_key_values (this); 692 free_key_values (this);
676} 693}
677 694
678static int object_count; 695static int object_count;
679 696
… …
687 objects.insert (this); 704 objects.insert (this);
688} 705}
689 706
690void object::unlink () 707void object::unlink ()
691{ 708{
692 assert (index);//D 709 if (!index)
710 return;
711
693 objects.erase (this); 712 objects.erase (this);
694 refcnt_dec (); 713 refcnt_dec ();
695} 714}
696 715
697void 716void
… …
771 * drop on that space. 790 * drop on that space.
772 */ 791 */
773 if (!drop_to_ground 792 if (!drop_to_ground
774 || !map 793 || !map
775 || map->in_memory != MAP_IN_MEMORY 794 || map->in_memory != MAP_IN_MEMORY
795 || map->nodrop
776 || ms ().move_block == MOVE_ALL) 796 || ms ().move_block == MOVE_ALL)
777 { 797 {
778 while (inv) 798 while (inv)
779 { 799 {
780 inv->destroy_inv (drop_to_ground); 800 inv->destroy_inv (drop_to_ground);
… …
814 834
815 if (flag [FLAG_IS_LINKED]) 835 if (flag [FLAG_IS_LINKED])
816 remove_button_link (this); 836 remove_button_link (this);
817 837
818 if (flag [FLAG_FRIENDLY]) 838 if (flag [FLAG_FRIENDLY])
839 {
819 remove_friendly_object (this); 840 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
820 848
821 if (!flag [FLAG_REMOVED]) 849 if (!flag [FLAG_REMOVED])
822 remove (); 850 remove ();
823 851
824 destroy_inv (true); 852 destroy_inv (true);
… …
896 * This function removes the object op from the linked list of objects 924 * This function removes the object op from the linked list of objects
897 * which it is currently tied to. When this function is done, the 925 * which it is currently tied to. When this function is done, the
898 * object will have no environment. If the object previously had an 926 * object will have no environment. If the object previously had an
899 * environment, the x and y coordinates will be updated to 927 * environment, the x and y coordinates will be updated to
900 * the previous environment. 928 * the previous environment.
901 * Beware: This function is called from the editor as well!
902 */ 929 */
903void 930void
904object::remove () 931object::do_remove ()
905{ 932{
906 object *tmp, *last = 0; 933 object *tmp, *last = 0;
907 object *otmp; 934 object *otmp;
908 935
909 if (QUERY_FLAG (this, FLAG_REMOVED)) 936 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
952 } 979 }
953 else if (map) 980 else if (map)
954 { 981 {
955 if (type == PLAYER) 982 if (type == PLAYER)
956 { 983 {
984 // leaving a spot always closes any open container on the ground
985 if (container && !container->env)
986 // this causes spurious floorbox updates, but it ensures
987 // that the CLOSE event is being sent.
988 close_container ();
989
957 --map->players; 990 --map->players;
958 map->touch (); 991 map->touch ();
959 } 992 }
960 993
961 map->dirty = true; 994 map->dirty = true;
995 mapspace &ms = this->ms ();
962 996
963 /* link the object above us */ 997 /* link the object above us */
964 if (above) 998 if (above)
965 above->below = below; 999 above->below = below;
966 else 1000 else
967 map->at (x, y).top = below; /* we were top, set new top */ 1001 ms.top = below; /* we were top, set new top */
968 1002
969 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
970 if (below) 1004 if (below)
971 below->above = above; 1005 below->above = above;
972 else 1006 else
… …
974 /* Nothing below, which means we need to relink map object for this space 1008 /* Nothing below, which means we need to relink map object for this space
975 * use translated coordinates in case some oddness with map tiling is 1009 * use translated coordinates in case some oddness with map tiling is
976 * evident 1010 * evident
977 */ 1011 */
978 if (GET_MAP_OB (map, x, y) != this) 1012 if (GET_MAP_OB (map, x, y) != this)
979 {
980 char *dump = dump_object (this);
981 LOG (llevError,
982 "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); 1013 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 ());
983 free (dump);
984 dump = dump_object (GET_MAP_OB (map, x, y));
985 LOG (llevError, "%s\n", dump);
986 free (dump);
987 }
988 1014
989 map->at (x, y).bot = above; /* goes on above it. */ 1015 ms.bot = above; /* goes on above it. */
990 } 1016 }
991 1017
992 above = 0; 1018 above = 0;
993 below = 0; 1019 below = 0;
994 1020
995 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
996 return; 1022 return;
997 1023
998 int check_walk_off = !flag [FLAG_NO_APPLY]; 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
999 1025
1000 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1026 for (tmp = ms.bot; tmp; tmp = tmp->above)
1001 { 1027 {
1002 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1003 * being removed. 1029 * being removed.
1004 */ 1030 */
1005 1031
… …
1086 1112
1087 return 0; 1113 return 0;
1088} 1114}
1089 1115
1090/* 1116/*
1091 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1092 * job preparing multi-part monsters 1118 * job preparing multi-part monsters.
1093 */ 1119 */
1094object * 1120object *
1095insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1096{ 1122{
1097 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1125 */ 1151 */
1126object * 1152object *
1127insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1128{ 1154{
1129 object *tmp, *top, *floor = NULL; 1155 object *tmp, *top, *floor = NULL;
1130 sint16 x, y;
1131 1156
1132 if (QUERY_FLAG (op, FLAG_FREED)) 1157 if (QUERY_FLAG (op, FLAG_FREED))
1133 { 1158 {
1134 LOG (llevError, "Trying to insert freed object!\n"); 1159 LOG (llevError, "Trying to insert freed object!\n");
1135 return NULL; 1160 return NULL;
1136 } 1161 }
1162
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165
1166 op->remove ();
1137 1167
1138 if (!m) 1168 if (!m)
1139 { 1169 {
1140 char *dump = dump_object (op); 1170 char *dump = dump_object (op);
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1156#endif 1186#endif
1157 free (dump); 1187 free (dump);
1158 return op; 1188 return op;
1159 } 1189 }
1160 1190
1161 if (!QUERY_FLAG (op, FLAG_REMOVED))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165 free (dump);
1166 return op;
1167 }
1168
1169 if (op->more)
1170 {
1171 /* The part may be on a different map. */
1172
1173 object *more = op->more; 1191 if (object *more = op->more)
1174 1192 {
1175 /* We really need the caller to normalise coordinates - if
1176 * we set the map, that doesn't work if the location is within
1177 * a map and this is straddling an edge. So only if coordinate
1178 * is clear wrong do we normalise it.
1179 */
1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1182 else if (!more->map)
1183 {
1184 /* For backwards compatibility - when not dealing with tiled maps,
1185 * more->map should always point to the parent.
1186 */
1187 more->map = m;
1188 }
1189
1190 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1193 if (!insert_ob_in_map (more, m, originator, flag))
1191 { 1194 {
1192 if (!op->head) 1195 if (!op->head)
1193 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194 1197
1195 return 0; 1198 return 0;
… …
1200 1203
1201 /* Ideally, the caller figures this out. However, it complicates a lot 1204 /* Ideally, the caller figures this out. However, it complicates a lot
1202 * of areas of callers (eg, anything that uses find_free_spot would now 1205 * of areas of callers (eg, anything that uses find_free_spot would now
1203 * need extra work 1206 * need extra work
1204 */ 1207 */
1205 op->map = get_map_from_coord (m, &op->x, &op->y); 1208 if (!xy_normalise (m, op->x, op->y))
1206 x = op->x; 1209 return 0;
1207 y = op->y; 1210
1211 op->map = m;
1212 mapspace &ms = op->ms ();
1208 1213
1209 /* this has to be done after we translate the coordinates. 1214 /* this has to be done after we translate the coordinates.
1210 */ 1215 */
1211 if (op->nrof && !(flag & INS_NO_MERGE)) 1216 if (op->nrof && !(flag & INS_NO_MERGE))
1212 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1217 for (tmp = ms.bot; tmp; tmp = tmp->above)
1213 if (object::can_merge (op, tmp)) 1218 if (object::can_merge (op, tmp))
1214 { 1219 {
1215 op->nrof += tmp->nrof; 1220 op->nrof += tmp->nrof;
1216 tmp->destroy (); 1221 tmp->destroy ();
1217 } 1222 }
… …
1234 op->below = originator->below; 1239 op->below = originator->below;
1235 1240
1236 if (op->below) 1241 if (op->below)
1237 op->below->above = op; 1242 op->below->above = op;
1238 else 1243 else
1239 op->ms ().bot = op; 1244 ms.bot = op;
1240 1245
1241 /* since *below* originator, no need to update top */ 1246 /* since *below* originator, no need to update top */
1242 originator->below = op; 1247 originator->below = op;
1243 } 1248 }
1244 else 1249 else
1245 { 1250 {
1251 top = ms.bot;
1252
1246 /* If there are other objects, then */ 1253 /* If there are other objects, then */
1247 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1254 if ((!(flag & INS_MAP_LOAD)) && top)
1248 { 1255 {
1249 object *last = 0; 1256 object *last = 0;
1250 1257
1251 /* 1258 /*
1252 * If there are multiple objects on this space, we do some trickier handling. 1259 * If there are multiple objects on this space, we do some trickier handling.
… …
1258 * once we get to them. This reduces the need to traverse over all of 1265 * once we get to them. This reduces the need to traverse over all of
1259 * them when adding another one - this saves quite a bit of cpu time 1266 * them when adding another one - this saves quite a bit of cpu time
1260 * when lots of spells are cast in one area. Currently, it is presumed 1267 * when lots of spells are cast in one area. Currently, it is presumed
1261 * that flying non pickable objects are spell objects. 1268 * that flying non pickable objects are spell objects.
1262 */ 1269 */
1263 while (top) 1270 for (top = ms.bot; top; top = top->above)
1264 { 1271 {
1265 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1272 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266 floor = top; 1273 floor = top;
1267 1274
1268 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1275 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1271 top = top->below; 1278 top = top->below;
1272 break; 1279 break;
1273 } 1280 }
1274 1281
1275 last = top; 1282 last = top;
1276 top = top->above;
1277 } 1283 }
1278 1284
1279 /* Don't want top to be NULL, so set it to the last valid object */ 1285 /* Don't want top to be NULL, so set it to the last valid object */
1280 top = last; 1286 top = last;
1281 1287
… …
1283 * looks like instead of lots of conditions here. 1289 * looks like instead of lots of conditions here.
1284 * makes things faster, and effectively the same result. 1290 * makes things faster, and effectively the same result.
1285 */ 1291 */
1286 1292
1287 /* Have object 'fall below' other objects that block view. 1293 /* Have object 'fall below' other objects that block view.
1288 * Unless those objects are exits, type 66 1294 * Unless those objects are exits.
1289 * If INS_ON_TOP is used, don't do this processing 1295 * If INS_ON_TOP is used, don't do this processing
1290 * Need to find the object that in fact blocks view, otherwise 1296 * Need to find the object that in fact blocks view, otherwise
1291 * stacking is a bit odd. 1297 * stacking is a bit odd.
1292 */ 1298 */
1293 if (!(flag & INS_ON_TOP) && 1299 if (!(flag & INS_ON_TOP)
1294 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1300 && ms.flags () & P_BLOCKSVIEW
1301 && (op->face && !faces [op->face].visibility))
1295 { 1302 {
1296 for (last = top; last != floor; last = last->below) 1303 for (last = top; last != floor; last = last->below)
1297 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298 break; 1305 break;
1306
1299 /* Check to see if we found the object that blocks view, 1307 /* Check to see if we found the object that blocks view,
1300 * and make sure we have a below pointer for it so that 1308 * and make sure we have a below pointer for it so that
1301 * we can get inserted below this one, which requires we 1309 * we can get inserted below this one, which requires we
1302 * set top to the object below us. 1310 * set top to the object below us.
1303 */ 1311 */
… …
1305 top = last->below; 1313 top = last->below;
1306 } 1314 }
1307 } /* If objects on this space */ 1315 } /* If objects on this space */
1308 1316
1309 if (flag & INS_MAP_LOAD) 1317 if (flag & INS_MAP_LOAD)
1310 top = GET_MAP_TOP (op->map, op->x, op->y); 1318 top = ms.top;
1311 1319
1312 if (flag & INS_ABOVE_FLOOR_ONLY) 1320 if (flag & INS_ABOVE_FLOOR_ONLY)
1313 top = floor; 1321 top = floor;
1314 1322
1315 /* Top is the object that our object (op) is going to get inserted above. 1323 /* Top is the object that our object (op) is going to get inserted above.
1316 */ 1324 */
1317 1325
1318 /* First object on this space */ 1326 /* First object on this space */
1319 if (!top) 1327 if (!top)
1320 { 1328 {
1321 op->above = GET_MAP_OB (op->map, op->x, op->y); 1329 op->above = ms.bot;
1322 1330
1323 if (op->above) 1331 if (op->above)
1324 op->above->below = op; 1332 op->above->below = op;
1325 1333
1326 op->below = 0; 1334 op->below = 0;
1327 op->ms ().bot = op; 1335 ms.bot = op;
1328 } 1336 }
1329 else 1337 else
1330 { /* get inserted into the stack above top */ 1338 { /* get inserted into the stack above top */
1331 op->above = top->above; 1339 op->above = top->above;
1332 1340
… …
1336 op->below = top; 1344 op->below = top;
1337 top->above = op; 1345 top->above = op;
1338 } 1346 }
1339 1347
1340 if (!op->above) 1348 if (!op->above)
1341 op->ms ().top = op; 1349 ms.top = op;
1342 } /* else not INS_BELOW_ORIGINATOR */ 1350 } /* else not INS_BELOW_ORIGINATOR */
1343 1351
1344 if (op->type == PLAYER) 1352 if (op->type == PLAYER)
1345 { 1353 {
1346 op->contr->do_los = 1; 1354 op->contr->do_los = 1;
… …
1352 1360
1353 /* If we have a floor, we know the player, if any, will be above 1361 /* If we have a floor, we know the player, if any, will be above
1354 * it, so save a few ticks and start from there. 1362 * it, so save a few ticks and start from there.
1355 */ 1363 */
1356 if (!(flag & INS_MAP_LOAD)) 1364 if (!(flag & INS_MAP_LOAD))
1357 if (object *pl = op->ms ().player ()) 1365 if (object *pl = ms.player ())
1358 if (pl->contr->ns) 1366 if (pl->contr->ns)
1359 pl->contr->ns->floorbox_update (); 1367 pl->contr->ns->floorbox_update ();
1360 1368
1361 /* If this object glows, it may affect lighting conditions that are 1369 /* If this object glows, it may affect lighting conditions that are
1362 * visible to others on this map. But update_all_los is really 1370 * visible to others on this map. But update_all_los is really
… …
1421 tmp1->x = op->x; 1429 tmp1->x = op->x;
1422 tmp1->y = op->y; 1430 tmp1->y = op->y;
1423 insert_ob_in_map (tmp1, op->map, op, 0); 1431 insert_ob_in_map (tmp1, op->map, op, 0);
1424} 1432}
1425 1433
1434// XXX: function not returning object*
1426object * 1435object *
1427object::insert_at (object *where, object *originator, int flags) 1436object::insert_at (object *where, object *originator, int flags)
1428{ 1437{
1429 where->map->insert (this, where->x, where->y, originator, flags); 1438 where->map->insert (this, where->x, where->y, originator, flags);
1430} 1439}
… …
1771 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1780 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1781 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773 { 1782 {
1774 1783
1775 float 1784 float
1776 diff = tmp->move_slow_penalty * FABS (op->speed); 1785 diff = tmp->move_slow_penalty * fabs (op->speed);
1777 1786
1778 if (op->type == PLAYER) 1787 if (op->type == PLAYER)
1779 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1788 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1780 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1789 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781 diff /= 4.0; 1790 diff /= 4.0;
… …
1988 } 1997 }
1989 1998
1990 if (!index) 1999 if (!index)
1991 return -1; 2000 return -1;
1992 2001
1993 return altern[RANDOM () % index]; 2002 return altern [rndm (index)];
1994} 2003}
1995 2004
1996/* 2005/*
1997 * find_first_free_spot(archetype, maptile, x, y) works like 2006 * find_first_free_spot(archetype, maptile, x, y) works like
1998 * find_free_spot(), but it will search max number of squares. 2007 * find_free_spot(), but it will search max number of squares.
… …
2019{ 2028{
2020 arr += begin; 2029 arr += begin;
2021 end -= begin; 2030 end -= begin;
2022 2031
2023 while (--end) 2032 while (--end)
2024 swap (arr [end], arr [RANDOM () % (end + 1)]); 2033 swap (arr [end], arr [rndm (end + 1)]);
2025} 2034}
2026 2035
2027/* new function to make monster searching more efficient, and effective! 2036/* new function to make monster searching more efficient, and effective!
2028 * This basically returns a randomized array (in the passed pointer) of 2037 * This basically returns a randomized array (in the passed pointer) of
2029 * the spaces to find monsters. In this way, it won't always look for 2038 * the spaces to find monsters. In this way, it won't always look for
… …
2341 insert_ob_in_ob (object_create_clone (item), dst); 2350 insert_ob_in_ob (object_create_clone (item), dst);
2342 2351
2343 return dst; 2352 return dst;
2344} 2353}
2345 2354
2346/* GROS - Creates an object using a string representing its content. */
2347/* Basically, we save the content of the string to a temp file, then call */
2348/* load_object on it. I admit it is a highly inefficient way to make things, */
2349/* but it was simple to make and allows reusing the load_object function. */
2350/* Remember not to use load_object_str in a time-critical situation. */
2351/* Also remember that multiparts objects are not supported for now. */
2352object *
2353load_object_str (const char *obstr)
2354{
2355 object *op;
2356 char filename[MAX_BUF];
2357
2358 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2359
2360 FILE *tempfile = fopen (filename, "w");
2361
2362 if (tempfile == NULL)
2363 {
2364 LOG (llevError, "Error - Unable to access load object temp file\n");
2365 return NULL;
2366 }
2367
2368 fprintf (tempfile, obstr);
2369 fclose (tempfile);
2370
2371 op = object::create ();
2372
2373 object_thawer thawer (filename);
2374
2375 if (thawer)
2376 load_object (thawer, op, 0);
2377
2378 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2379 CLEAR_FLAG (op, FLAG_REMOVED);
2380
2381 return op;
2382}
2383
2384/* This returns the first object in who's inventory that 2355/* This returns the first object in who's inventory that
2385 * has the same type and subtype match. 2356 * has the same type and subtype match.
2386 * returns NULL if no match. 2357 * returns NULL if no match.
2387 */ 2358 */
2388object * 2359object *
… …
2441 if (link->key == canonical_key) 2412 if (link->key == canonical_key)
2442 return link->value; 2413 return link->value;
2443 2414
2444 return 0; 2415 return 0;
2445} 2416}
2446
2447 2417
2448/* 2418/*
2449 * Updates the canonical_key in op to value. 2419 * Updates the canonical_key in op to value.
2450 * 2420 *
2451 * canonical_key is a shared string (value doesn't have to be). 2421 * canonical_key is a shared string (value doesn't have to be).
… …
2591{ 2561{
2592 char flagdesc[512]; 2562 char flagdesc[512];
2593 char info2[256 * 4]; 2563 char info2[256 * 4];
2594 char *p = info; 2564 char *p = info;
2595 2565
2596 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2566 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2597 count, uuid.seq, 2567 count, uuid.seq,
2598 &name, 2568 &name,
2599 title ? "\",title:" : "", 2569 title ? "\",title:\"" : "",
2600 title ? (const char *)title : "", 2570 title ? (const char *)title : "",
2601 flag_desc (flagdesc, 512), type); 2571 flag_desc (flagdesc, 512), type);
2602 2572
2603 if (env) 2573 if (env)
2604 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2574 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2621{ 2591{
2622 static char info[256 * 4]; 2592 static char info[256 * 4];
2623 return debug_desc (info); 2593 return debug_desc (info);
2624} 2594}
2625 2595
2596struct region *
2597object::region () const
2598{
2599 return map ? map->region (x, y)
2600 : region::default_region ();
2601}
2602
2603const materialtype_t *
2604object::dominant_material () const
2605{
2606 if (materialtype_t *mat = name_to_material (materialname))
2607 return mat;
2608
2609 // omfg this is slow, this has to be temporary :)
2610 shstr unknown ("unknown");
2611
2612 return name_to_material (unknown);
2613}
2614
2615void
2616object::open_container (object *new_container)
2617{
2618 if (container == new_container)
2619 return;
2620
2621 if (object *old_container = container)
2622 {
2623 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2624 return;
2625
2626#if 0
2627 // remove the "Close old_container" object.
2628 if (object *closer = old_container->inv)
2629 if (closer->type == CLOSE_CON)
2630 closer->destroy ();
2631#endif
2632
2633 old_container->flag [FLAG_APPLIED] = 0;
2634 container = 0;
2635
2636 esrv_update_item (UPD_FLAGS, this, old_container);
2637 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2638 }
2639
2640 if (new_container)
2641 {
2642 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2643 return;
2644
2645 // TODO: this does not seem to serve any purpose anymore?
2646#if 0
2647 // insert the "Close Container" object.
2648 if (archetype *closer = new_container->other_arch)
2649 {
2650 object *closer = arch_to_object (new_container->other_arch);
2651 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2652 new_container->insert (closer);
2653 }
2654#endif
2655
2656 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2657
2658 new_container->flag [FLAG_APPLIED] = 1;
2659 container = new_container;
2660
2661 esrv_update_item (UPD_FLAGS, this, new_container);
2662 esrv_send_inventory (this, new_container);
2663 }
2664}
2665
2666

Diff Legend

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