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.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 43};
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 375 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 376 * The result of the dump is stored in the static global errmsg array.
379 */ 377 */
380 378
381void 379char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 380dump_object (object *op)
437{ 381{
438 if (op == NULL) 382 if (!op)
439 { 383 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 384
447void 385 object_freezer freezer;
448dump_all_objects (void) 386 save_object (freezer, op, 3);
449{ 387 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 388}
458 389
459/* 390/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 391 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 object *op;
487 418
488 for (op = objects; op != NULL; op = op->next) 419 for (op = object::first; op != NULL; op = op->next)
489 if (op->count == i) 420 if (op->count == i)
490 break; 421 break;
422
491 return op; 423 return op;
492} 424}
493 425
494/* 426/*
495 * Returns the first object which has a name equal to the argument. 427 * Returns the first object which has a name equal to the argument.
… …
501find_object_name (const char *str) 433find_object_name (const char *str)
502{ 434{
503 shstr_cmp str_ (str); 435 shstr_cmp str_ (str);
504 object *op; 436 object *op;
505 437
506 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 439 if (op->name == str_)
508 break; 440 break;
509 441
510 return op; 442 return op;
511} 443}
512 444
513void 445void
514free_all_object_data () 446free_all_object_data ()
515{ 447{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 448 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 449}
539 450
540/* 451/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 453 * skill and experience objects.
… …
612 523
613 /* What is not cleared is next, prev, and count */ 524 /* What is not cleared is next, prev, and count */
614 525
615 expmul = 1.0; 526 expmul = 1.0;
616 face = blank_face; 527 face = blank_face;
617 attacked_by_count = -1;
618 528
619 if (settings.casting_time) 529 if (settings.casting_time)
620 casting_time = -1; 530 casting_time = -1;
621} 531}
622 532
… …
917 827
918 if (op->more != NULL) 828 if (op->more != NULL)
919 update_object (op->more, action); 829 update_object (op->more, action);
920} 830}
921 831
922static unordered_vector<object *> mortals; 832object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 833object::vector object::objects; // not yet used
834object *object::first;
924 835
925void object::free_mortals () 836void object::free_mortals ()
926{ 837{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 839 if ((*i)->refcnt)
929 ++i; // further delay freeing 840 ++i; // further delay freeing
930 else 841 else
931 { 842 {
932 freed.push_back (*i);//D
933 //delete *i; 843 delete *i;
934 mortals.erase (i); 844 mortals.erase (i);
935 } 845 }
936 846
937 if (mortals.size() && 0)//D 847 static int lastmortals = 0;//D
848
849 if (mortals.size() != lastmortals && lastmortals > 100)//D
850 {
851 lastmortals = mortals.size ();//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853 }
939} 854}
940 855
941object::object () 856object::object ()
942{ 857{
943 SET_FLAG (this, FLAG_REMOVED); 858 SET_FLAG (this, FLAG_REMOVED);
944 859
945 expmul = 1.0; 860 expmul = 1.0;
946 face = blank_face; 861 face = blank_face;
947 attacked_by_count = -1;
948} 862}
949 863
950object::~object () 864object::~object ()
951{ 865{
952 free_key_values (this); 866 free_key_values (this);
953} 867}
954 868
955void object::link () 869void object::link ()
956{ 870{
957 count = ++ob_count; 871 count = ++ob_count;
872 uuid = gen_uuid ();
958 873
959 prev = 0; 874 prev = 0;
960 next = objects; 875 next = object::first;
961 876
962 if (objects) 877 if (object::first)
963 objects->prev = this; 878 object::first->prev = this;
964 879
965 objects = this; 880 object::first = this;
966} 881}
967 882
968void object::unlink () 883void object::unlink ()
969{ 884{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 885 if (this == object::first)
974 objects = next; 886 object::first = next;
975 887
976 /* Remove this object from the list of used objects */ 888 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 889 if (prev) prev->next = next;
890 if (next) next->prev = prev;
891
980 prev = 0; 892 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 893 next = 0;
987 }
988} 894}
989 895
990object *object::create () 896object *object::create ()
991{ 897{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 898 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 899 op->link ();
1006 return op; 900 return op;
1007} 901}
1008 902
1009/* 903/*
… …
1011 * it from the list of used objects, and puts it on the list of 905 * it from the list of used objects, and puts it on the list of
1012 * free objects. The IS_FREED() flag is set in the object. 906 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 907 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 908 * this function to succeed.
1015 * 909 *
1016 * If free_inventory is set, free inventory as well. Else drop items in 910 * If destroy_inventory is set, free inventory as well. Else drop items in
1017 * inventory to the ground. 911 * inventory to the ground.
1018 */ 912 */
1019void object::free (bool free_inventory) 913void object::destroy (bool destroy_inventory)
1020{ 914{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 915 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 916 return;
1023 917
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 918 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1029 923
1030 SET_FLAG (this, FLAG_FREED); 924 SET_FLAG (this, FLAG_FREED);
1031 925
1032 if (more) 926 if (more)
1033 { 927 {
1034 more->free (free_inventory); 928 more->destroy (destroy_inventory);
1035 more = 0; 929 more = 0;
1036 } 930 }
1037 931
1038 if (inv) 932 if (inv)
1039 { 933 {
1040 /* Only if the space blocks everything do we not process - 934 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 935 * if some form of movement is allowed, let objects
1042 * drop on that space. 936 * drop on that space.
1043 */ 937 */
1044 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 938 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1045 { 939 {
1046 object *op = inv; 940 object *op = inv;
1047 941
1048 while (op) 942 while (op)
1049 { 943 {
1050 object *tmp = op->below; 944 object *tmp = op->below;
1051 op->free (free_inventory); 945 op->destroy (destroy_inventory);
1052 op = tmp; 946 op = tmp;
1053 } 947 }
1054 } 948 }
1055 else 949 else
1056 { /* Put objects in inventory onto this space */ 950 { /* Put objects in inventory onto this space */
… …
1075 op = tmp; 969 op = tmp;
1076 } 970 }
1077 } 971 }
1078 } 972 }
1079 973
974 // clear those pointers that likely might have circular references to us
1080 owner = 0; 975 owner = 0;
976 enemy = 0;
977 attacked_by = 0;
978
979 // only relevant for players(?), but make sure of it anyways
980 contr = 0;
1081 981
1082 /* Remove object from the active list */ 982 /* Remove object from the active list */
1083 speed = 0; 983 speed = 0;
1084 update_ob_speed (this); 984 update_ob_speed (this);
1085 985
… …
1097sub_weight (object *op, signed long weight) 997sub_weight (object *op, signed long weight)
1098{ 998{
1099 while (op != NULL) 999 while (op != NULL)
1100 { 1000 {
1101 if (op->type == CONTAINER) 1001 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1002 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1003
1105 op->carrying -= weight; 1004 op->carrying -= weight;
1106 op = op->env; 1005 op = op->env;
1107 } 1006 }
1108} 1007}
1109 1008
… …
1117 */ 1016 */
1118 1017
1119void 1018void
1120remove_ob (object *op) 1019remove_ob (object *op)
1121{ 1020{
1021 object *tmp, *last = 0;
1122 object * 1022 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1023
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1024 int check_walk_off;
1132 mapstruct * 1025 maptile *m;
1133 m;
1134 1026
1135 sint16 1027 sint16 x, y;
1136 x,
1137 y;
1138 1028
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1029 if (QUERY_FLAG (op, FLAG_REMOVED))
1140 return; 1030 return;
1141 1031
1142 SET_FLAG (op, FLAG_REMOVED); 1032 SET_FLAG (op, FLAG_REMOVED);
… …
1219 * use translated coordinates in case some oddness with map tiling is 1109 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1110 * evident
1221 */ 1111 */
1222 if (GET_MAP_OB (m, x, y) != op) 1112 if (GET_MAP_OB (m, x, y) != op)
1223 { 1113 {
1224 dump_object (op); 1114 char *dump = dump_object (op);
1225 LOG (llevError, 1115 LOG (llevError,
1226 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1116 "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);
1117 free (dump);
1227 dump_object (GET_MAP_OB (m, x, y)); 1118 dump = dump_object (GET_MAP_OB (m, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1119 LOG (llevError, "%s\n", dump);
1120 free (dump);
1229 } 1121 }
1230 1122
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1123 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1232 } 1124 }
1233 1125
… …
1235 op->below = 0; 1127 op->below = 0;
1236 1128
1237 if (op->map->in_memory == MAP_SAVING) 1129 if (op->map->in_memory == MAP_SAVING)
1238 return; 1130 return;
1239 1131
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1242 1133
1243 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1134 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1244 { 1135 {
1245 /* No point updating the players look faces if he is the object 1136 /* No point updating the players look faces if he is the object
… …
1260 1151
1261 tmp->contr->socket.update_look = 1; 1152 tmp->contr->socket.update_look = 1;
1262 } 1153 }
1263 1154
1264 /* See if player moving off should effect something */ 1155 /* See if player moving off should effect something */
1265 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1156 if (check_walk_off
1157 && ((op->move_type & tmp->move_off)
1158 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1159 {
1267 move_apply (tmp, op, NULL); 1160 move_apply (tmp, op, NULL);
1268 1161
1269 if (was_destroyed (op, tag)) 1162 if (op->destroyed ())
1270 {
1271 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272 }
1273 } 1164 }
1274 1165
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1167
1277 if (tmp->above == tmp) 1168 if (tmp->above == tmp)
… …
1330 free_object (op); 1221 free_object (op);
1331 return top; 1222 return top;
1332 } 1223 }
1333 } 1224 }
1334 1225
1335 return NULL; 1226 return 0;
1336} 1227}
1337 1228
1338/* 1229/*
1339 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1230 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1340 * job preparing multi-part monsters 1231 * job preparing multi-part monsters
1341 */ 1232 */
1342object * 1233object *
1343insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1234insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344{ 1235{
1345 object *tmp; 1236 object *tmp;
1346 1237
1347 if (op->head) 1238 if (op->head)
1348 op = op->head; 1239 op = op->head;
… …
1376 * NULL if 'op' was destroyed 1267 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1268 * just 'op' otherwise
1378 */ 1269 */
1379 1270
1380object * 1271object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1273{
1383 object *tmp, *top, *floor = NULL; 1274 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1275 sint16 x, y;
1385 1276
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1277 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1280 return NULL;
1390 } 1281 }
1391 1282
1392 if (m == NULL) 1283 if (m == NULL)
1393 { 1284 {
1394 dump_object (op); 1285 char *dump = dump_object (op);
1395 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1286 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1287 free (dump);
1396 return op; 1288 return op;
1397 } 1289 }
1398 1290
1399 if (out_of_map (m, op->x, op->y)) 1291 if (out_of_map (m, op->x, op->y))
1400 { 1292 {
1401 dump_object (op); 1293 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1294 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403#ifdef MANY_CORES 1295#ifdef MANY_CORES
1404 /* Better to catch this here, as otherwise the next use of this object 1296 /* Better to catch this here, as otherwise the next use of this object
1405 * is likely to cause a crash. Better to find out where it is getting 1297 * is likely to cause a crash. Better to find out where it is getting
1406 * improperly inserted. 1298 * improperly inserted.
1407 */ 1299 */
1408 abort (); 1300 abort ();
1409#endif 1301#endif
1302 free (dump);
1410 return op; 1303 return op;
1411 } 1304 }
1412 1305
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1306 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1307 {
1415 dump_object (op); 1308 char *dump = dump_object (op);
1416 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1309 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1310 free (dump);
1417 return op; 1311 return op;
1418 } 1312 }
1419 1313
1420 if (op->more != NULL) 1314 if (op->more != NULL)
1421 { 1315 {
… …
1667 remove_ob (tmp); 1561 remove_ob (tmp);
1668 free_object (tmp); 1562 free_object (tmp);
1669 } 1563 }
1670 } 1564 }
1671 1565
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1566 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1567
1674 tmp1->x = op->x; 1568 tmp1->x = op->x;
1675 tmp1->y = op->y; 1569 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1570 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1571}
… …
1858 tmp, * 1752 tmp, *
1859 otmp; 1753 otmp;
1860 1754
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1756 {
1863 dump_object (op); 1757 char *dump = dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1758 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759 free (dump);
1865 return op; 1760 return op;
1866 } 1761 }
1867 1762
1868 if (where == NULL) 1763 if (where == NULL)
1869 { 1764 {
1870 dump_object (op); 1765 char *dump = dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1766 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767 free (dump);
1872 return op; 1768 return op;
1873 } 1769 }
1874 1770
1875 if (where->head) 1771 if (where->head)
1876 { 1772 {
… …
1976 */ 1872 */
1977 1873
1978int 1874int
1979check_move_on (object *op, object *originator) 1875check_move_on (object *op, object *originator)
1980{ 1876{
1981 object * 1877 object *tmp;
1982 tmp; 1878 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1879 int x = op->x, y = op->y;
1989 1880
1990 MoveType 1881 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1882
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1883 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1884 return 0;
1997
1998 tag = op->count;
1999 1885
2000 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1886 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2001 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1887 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2002 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1888 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003 1889
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1950 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1951 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1952 {
2067 move_apply (tmp, op, originator); 1953 move_apply (tmp, op, originator);
2068 1954
2069 if (was_destroyed (op, tag)) 1955 if (op->destroyed ())
2070 return 1; 1956 return 1;
2071 1957
2072 /* what the person/creature stepped onto has moved the object 1958 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1959 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1960 * have a feeling strange problems would result.
… …
2086 * a matching archetype at the given map and coordinates. 1972 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2088 */ 1974 */
2089 1975
2090object * 1976object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1977present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1978{
2093 object * 1979 object *
2094 tmp; 1980 tmp;
2095 1981
2096 if (m == NULL || out_of_map (m, x, y)) 1982 if (m == NULL || out_of_map (m, x, y))
… …
2109 * a matching type variable at the given map and coordinates. 1995 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1996 * The first matching object is returned, or NULL if none.
2111 */ 1997 */
2112 1998
2113object * 1999object *
2114present (unsigned char type, mapstruct *m, int x, int y) 2000present (unsigned char type, maptile *m, int x, int y)
2115{ 2001{
2116 object * 2002 object *
2117 tmp; 2003 tmp;
2118 2004
2119 if (out_of_map (m, x, y)) 2005 if (out_of_map (m, x, y))
… …
2259 * the archetype because that isn't correct if the monster has been 2145 * the archetype because that isn't correct if the monster has been
2260 * customized, changed states, etc. 2146 * customized, changed states, etc.
2261 */ 2147 */
2262 2148
2263int 2149int
2264find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2150find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265{ 2151{
2266 int 2152 int
2267 i, 2153 i,
2268 index = 0, flag; 2154 index = 0, flag;
2269 static int 2155 static int
… …
2290 return -1; 2176 return -1;
2291 return altern[RANDOM () % index]; 2177 return altern[RANDOM () % index];
2292} 2178}
2293 2179
2294/* 2180/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2181 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2182 * find_free_spot(), but it will search max number of squares.
2297 * But it will return the first available spot, not a random choice. 2183 * But it will return the first available spot, not a random choice.
2298 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2184 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2299 */ 2185 */
2300 2186
2301int 2187int
2302find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2188find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303{ 2189{
2304 int 2190 int
2305 i; 2191 i;
2306 2192
2307 for (i = 0; i < SIZEOFFREE; i++) 2193 for (i = 0; i < SIZEOFFREE; i++)
… …
2371 * because we have to know what movement the thing looking to move 2257 * because we have to know what movement the thing looking to move
2372 * there is capable of. 2258 * there is capable of.
2373 */ 2259 */
2374 2260
2375int 2261int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2262find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2263{
2378 int 2264 int
2379 i, 2265 i,
2380 max = SIZEOFFREE, mflags; 2266 max = SIZEOFFREE, mflags;
2381 2267
2382 sint16 nx, ny; 2268 sint16 nx, ny;
2383 object * 2269 object *
2384 tmp; 2270 tmp;
2385 mapstruct * 2271 maptile *
2386 mp; 2272 mp;
2387 2273
2388 MoveType blocked, move_type; 2274 MoveType blocked, move_type;
2389 2275
2390 if (exclude && exclude->head) 2276 if (exclude && exclude->head)
… …
2598 * Modified to be map tile aware -.MSW 2484 * Modified to be map tile aware -.MSW
2599 */ 2485 */
2600 2486
2601 2487
2602int 2488int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2489can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2490{
2605 sint16 dx, dy; 2491 sint16 dx, dy;
2606 int 2492 int
2607 mflags; 2493 mflags;
2608 2494
… …
2688 if (prev) 2574 if (prev)
2689 prev->more = tmp; 2575 prev->more = tmp;
2690 prev = tmp; 2576 prev = tmp;
2691 } 2577 }
2692 2578
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2579 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2580 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2581
2699 return dst; 2582 return dst;
2700} 2583}
2701 2584
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2585/* GROS - Creates an object using a string representing its content. */
2712
2713/* Basically, we save the content of the string to a temp file, then call */ 2586/* Basically, we save the content of the string to a temp file, then call */
2714
2715/* load_object on it. I admit it is a highly inefficient way to make things, */ 2587/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717/* but it was simple to make and allows reusing the load_object function. */ 2588/* but it was simple to make and allows reusing the load_object function. */
2718
2719/* Remember not to use load_object_str in a time-critical situation. */ 2589/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2590/* Also remember that multiparts objects are not supported for now. */
2722 2591
2723object * 2592object *
2724load_object_str (const char *obstr) 2593load_object_str (const char *obstr)
2725{ 2594{
2726 object * 2595 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2596 char filename[MAX_BUF];
2730 2597
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2598 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2599
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2600 FILE *tempfile = fopen (filename, "w");
2735 2601
2736 if (tempfile == NULL) 2602 if (tempfile == NULL)
2737 { 2603 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2604 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2605 return NULL;
2740 }; 2606 }
2607
2741 fprintf (tempfile, obstr); 2608 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2609 fclose (tempfile);
2743 2610
2744 op = get_object (); 2611 op = get_object ();
2745 2612
… …
2759 * returns NULL if no match. 2626 * returns NULL if no match.
2760 */ 2627 */
2761object * 2628object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2629find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2630{
2764 object * 2631 object *tmp;
2765 tmp;
2766 2632
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2633 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2634 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2635 return tmp;
2770 2636
… …
2778 * do the desired thing. 2644 * do the desired thing.
2779 */ 2645 */
2780key_value * 2646key_value *
2781get_ob_key_link (const object *ob, const char *key) 2647get_ob_key_link (const object *ob, const char *key)
2782{ 2648{
2783 key_value * 2649 key_value *link;
2784 link;
2785 2650
2786 for (link = ob->key_values; link != NULL; link = link->next) 2651 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2652 if (link->key == key)
2789 {
2790 return link; 2653 return link;
2791 }
2792 }
2793 2654
2794 return NULL; 2655 return NULL;
2795} 2656}
2796 2657
2797/* 2658/*

Diff Legend

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