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.41 by root, Thu Sep 14 01:12:28 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 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
933 //freed.push_back (*i);//D
934 delete *i; 843 delete *i;
935 mortals.erase (i); 844 mortals.erase (i);
936 } 845 }
937 846
938 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
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853 }
940} 854}
941 855
942object::object () 856object::object ()
943{ 857{
944 SET_FLAG (this, FLAG_REMOVED); 858 SET_FLAG (this, FLAG_REMOVED);
945 859
946 expmul = 1.0; 860 expmul = 1.0;
947 face = blank_face; 861 face = blank_face;
948 attacked_by_count = -1;
949} 862}
950 863
951object::~object () 864object::~object ()
952{ 865{
953 free_key_values (this); 866 free_key_values (this);
… …
957{ 870{
958 count = ++ob_count; 871 count = ++ob_count;
959 uuid = gen_uuid (); 872 uuid = gen_uuid ();
960 873
961 prev = 0; 874 prev = 0;
962 next = objects; 875 next = object::first;
963 876
964 if (objects) 877 if (object::first)
965 objects->prev = this; 878 object::first->prev = this;
966 879
967 objects = this; 880 object::first = this;
968} 881}
969 882
970void object::unlink () 883void object::unlink ()
971{ 884{
972 //count = 0;//D
973 if (!prev && !next) return;//D
974
975 if (this == objects) 885 if (this == object::first)
976 objects = next; 886 object::first = next;
977 887
978 /* Remove this object from the list of used objects */ 888 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next; 889 if (prev) prev->next = next;
980 if (next) next->prev = prev; 890 if (next) next->prev = prev;
981 891
… …
983 next = 0; 893 next = 0;
984} 894}
985 895
986object *object::create () 896object *object::create ()
987{ 897{
988 object *op;
989
990 if (freed.empty ())
991 op = new object; 898 object *op = new object;
992 else
993 {
994 // highly annoying, but the only way to get it stable right now
995 op = freed.back ();
996 freed.pop_back ();
997 op->~object ();
998 new ((void *) op) object;
999 }
1000
1001 op->link (); 899 op->link ();
1002 return op; 900 return op;
1003} 901}
1004 902
1005/* 903/*
… …
1007 * 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
1008 * free objects. The IS_FREED() flag is set in the object. 906 * free objects. The IS_FREED() flag is set in the object.
1009 * The object must have been removed by remove_ob() first for 907 * The object must have been removed by remove_ob() first for
1010 * this function to succeed. 908 * this function to succeed.
1011 * 909 *
1012 * 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
1013 * inventory to the ground. 911 * inventory to the ground.
1014 */ 912 */
1015void object::free (bool free_inventory) 913void object::destroy (bool destroy_inventory)
1016{ 914{
1017 if (QUERY_FLAG (this, FLAG_FREED)) 915 if (QUERY_FLAG (this, FLAG_FREED))
1018 return; 916 return;
1019 917
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 918 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1023 if (!QUERY_FLAG (this, FLAG_REMOVED)) 921 if (!QUERY_FLAG (this, FLAG_REMOVED))
1024 remove_ob (this); 922 remove_ob (this);
1025 923
1026 SET_FLAG (this, FLAG_FREED); 924 SET_FLAG (this, FLAG_FREED);
1027 925
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029
1030 if (more) 926 if (more)
1031 { 927 {
1032 more->free (free_inventory); 928 more->destroy (destroy_inventory);
1033 more = 0; 929 more = 0;
1034 } 930 }
1035 931
1036 if (inv) 932 if (inv)
1037 { 933 {
1038 /* Only if the space blocks everything do we not process - 934 /* Only if the space blocks everything do we not process -
1039 * if some form of movement is allowed, let objects 935 * if some form of movement is allowed, let objects
1040 * drop on that space. 936 * drop on that space.
1041 */ 937 */
1042 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)
1043 { 939 {
1044 object *op = inv; 940 object *op = inv;
1045 941
1046 while (op) 942 while (op)
1047 { 943 {
1048 object *tmp = op->below; 944 object *tmp = op->below;
1049 op->free (free_inventory); 945 op->destroy (destroy_inventory);
1050 op = tmp; 946 op = tmp;
1051 } 947 }
1052 } 948 }
1053 else 949 else
1054 { /* Put objects in inventory onto this space */ 950 { /* Put objects in inventory onto this space */
… …
1073 op = tmp; 969 op = tmp;
1074 } 970 }
1075 } 971 }
1076 } 972 }
1077 973
974 // clear those pointers that likely might have circular references to us
1078 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;
1079 981
1080 /* Remove object from the active list */ 982 /* Remove object from the active list */
1081 speed = 0; 983 speed = 0;
1082 update_ob_speed (this); 984 update_ob_speed (this);
1083 985
… …
1095sub_weight (object *op, signed long weight) 997sub_weight (object *op, signed long weight)
1096{ 998{
1097 while (op != NULL) 999 while (op != NULL)
1098 { 1000 {
1099 if (op->type == CONTAINER) 1001 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1002 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1003
1103 op->carrying -= weight; 1004 op->carrying -= weight;
1104 op = op->env; 1005 op = op->env;
1105 } 1006 }
1106} 1007}
1107 1008
… …
1115 */ 1016 */
1116 1017
1117void 1018void
1118remove_ob (object *op) 1019remove_ob (object *op)
1119{ 1020{
1021 object *tmp, *last = 0;
1120 object * 1022 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1023
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1024 int check_walk_off;
1130 mapstruct * 1025 maptile *m;
1131 m;
1132 1026
1133 sint16 1027 sint16 x, y;
1134 x,
1135 y;
1136 1028
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1029 if (QUERY_FLAG (op, FLAG_REMOVED))
1138 return; 1030 return;
1139 1031
1140 SET_FLAG (op, FLAG_REMOVED); 1032 SET_FLAG (op, FLAG_REMOVED);
… …
1217 * use translated coordinates in case some oddness with map tiling is 1109 * use translated coordinates in case some oddness with map tiling is
1218 * evident 1110 * evident
1219 */ 1111 */
1220 if (GET_MAP_OB (m, x, y) != op) 1112 if (GET_MAP_OB (m, x, y) != op)
1221 { 1113 {
1222 dump_object (op); 1114 char *dump = dump_object (op);
1223 LOG (llevError, 1115 LOG (llevError,
1224 "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);
1225 dump_object (GET_MAP_OB (m, x, y)); 1118 dump = dump_object (GET_MAP_OB (m, x, y));
1226 LOG (llevError, "%s\n", errmsg); 1119 LOG (llevError, "%s\n", dump);
1120 free (dump);
1227 } 1121 }
1228 1122
1229 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. */
1230 } 1124 }
1231 1125
… …
1233 op->below = 0; 1127 op->below = 0;
1234 1128
1235 if (op->map->in_memory == MAP_SAVING) 1129 if (op->map->in_memory == MAP_SAVING)
1236 return; 1130 return;
1237 1131
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1240 1133
1241 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)
1242 { 1135 {
1243 /* 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
… …
1258 1151
1259 tmp->contr->socket.update_look = 1; 1152 tmp->contr->socket.update_look = 1;
1260 } 1153 }
1261 1154
1262 /* See if player moving off should effect something */ 1155 /* See if player moving off should effect something */
1263 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))
1264 { 1159 {
1265 move_apply (tmp, op, NULL); 1160 move_apply (tmp, op, NULL);
1266 1161
1267 if (was_destroyed (op, tag)) 1162 if (op->destroyed ())
1268 {
1269 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 ());
1270 }
1271 } 1164 }
1272 1165
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1167
1275 if (tmp->above == tmp) 1168 if (tmp->above == tmp)
… …
1328 free_object (op); 1221 free_object (op);
1329 return top; 1222 return top;
1330 } 1223 }
1331 } 1224 }
1332 1225
1333 return NULL; 1226 return 0;
1334} 1227}
1335 1228
1336/* 1229/*
1337 * 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
1338 * job preparing multi-part monsters 1231 * job preparing multi-part monsters
1339 */ 1232 */
1340object * 1233object *
1341insert_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)
1342{ 1235{
1343 object *tmp; 1236 object *tmp;
1344 1237
1345 if (op->head) 1238 if (op->head)
1346 op = op->head; 1239 op = op->head;
… …
1374 * NULL if 'op' was destroyed 1267 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1268 * just 'op' otherwise
1376 */ 1269 */
1377 1270
1378object * 1271object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1273{
1381 object *tmp, *top, *floor = NULL; 1274 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1275 sint16 x, y;
1383 1276
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1277 if (QUERY_FLAG (op, FLAG_FREED))
… …
1387 return NULL; 1280 return NULL;
1388 } 1281 }
1389 1282
1390 if (m == NULL) 1283 if (m == NULL)
1391 { 1284 {
1392 dump_object (op); 1285 char *dump = dump_object (op);
1393 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);
1394 return op; 1288 return op;
1395 } 1289 }
1396 1290
1397 if (out_of_map (m, op->x, op->y)) 1291 if (out_of_map (m, op->x, op->y))
1398 { 1292 {
1399 dump_object (op); 1293 char *dump = dump_object (op);
1400 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);
1401#ifdef MANY_CORES 1295#ifdef MANY_CORES
1402 /* 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
1403 * 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
1404 * improperly inserted. 1298 * improperly inserted.
1405 */ 1299 */
1406 abort (); 1300 abort ();
1407#endif 1301#endif
1302 free (dump);
1408 return op; 1303 return op;
1409 } 1304 }
1410 1305
1411 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1306 if (!QUERY_FLAG (op, FLAG_REMOVED))
1412 { 1307 {
1413 dump_object (op); 1308 char *dump = dump_object (op);
1414 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);
1415 return op; 1311 return op;
1416 } 1312 }
1417 1313
1418 if (op->more != NULL) 1314 if (op->more != NULL)
1419 { 1315 {
… …
1665 remove_ob (tmp); 1561 remove_ob (tmp);
1666 free_object (tmp); 1562 free_object (tmp);
1667 } 1563 }
1668 } 1564 }
1669 1565
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1566 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1567
1672 tmp1->x = op->x; 1568 tmp1->x = op->x;
1673 tmp1->y = op->y; 1569 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1570 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1571}
… …
1856 tmp, * 1752 tmp, *
1857 otmp; 1753 otmp;
1858 1754
1859 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1860 { 1756 {
1861 dump_object (op); 1757 char *dump = dump_object (op);
1862 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);
1863 return op; 1760 return op;
1864 } 1761 }
1865 1762
1866 if (where == NULL) 1763 if (where == NULL)
1867 { 1764 {
1868 dump_object (op); 1765 char *dump = dump_object (op);
1869 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);
1870 return op; 1768 return op;
1871 } 1769 }
1872 1770
1873 if (where->head) 1771 if (where->head)
1874 { 1772 {
… …
1974 */ 1872 */
1975 1873
1976int 1874int
1977check_move_on (object *op, object *originator) 1875check_move_on (object *op, object *originator)
1978{ 1876{
1979 object * 1877 object *tmp;
1980 tmp; 1878 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1879 int x = op->x, y = op->y;
1987 1880
1988 MoveType 1881 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1882
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1883 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1884 return 0;
1995
1996 tag = op->count;
1997 1885
1998 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);
1999 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);
2000 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);
2001 1889
… …
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1950 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2063 ((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))
2064 { 1952 {
2065 move_apply (tmp, op, originator); 1953 move_apply (tmp, op, originator);
2066 1954
2067 if (was_destroyed (op, tag)) 1955 if (op->destroyed ())
2068 return 1; 1956 return 1;
2069 1957
2070 /* what the person/creature stepped onto has moved the object 1958 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 1959 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 1960 * have a feeling strange problems would result.
… …
2084 * a matching archetype at the given map and coordinates. 1972 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2086 */ 1974 */
2087 1975
2088object * 1976object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 1977present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 1978{
2091 object * 1979 object *
2092 tmp; 1980 tmp;
2093 1981
2094 if (m == NULL || out_of_map (m, x, y)) 1982 if (m == NULL || out_of_map (m, x, y))
… …
2107 * a matching type variable at the given map and coordinates. 1995 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 1996 * The first matching object is returned, or NULL if none.
2109 */ 1997 */
2110 1998
2111object * 1999object *
2112present (unsigned char type, mapstruct *m, int x, int y) 2000present (unsigned char type, maptile *m, int x, int y)
2113{ 2001{
2114 object * 2002 object *
2115 tmp; 2003 tmp;
2116 2004
2117 if (out_of_map (m, x, y)) 2005 if (out_of_map (m, x, y))
… …
2257 * 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
2258 * customized, changed states, etc. 2146 * customized, changed states, etc.
2259 */ 2147 */
2260 2148
2261int 2149int
2262find_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)
2263{ 2151{
2264 int 2152 int
2265 i, 2153 i,
2266 index = 0, flag; 2154 index = 0, flag;
2267 static int 2155 static int
… …
2288 return -1; 2176 return -1;
2289 return altern[RANDOM () % index]; 2177 return altern[RANDOM () % index];
2290} 2178}
2291 2179
2292/* 2180/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2181 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2182 * find_free_spot(), but it will search max number of squares.
2295 * 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.
2296 * 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.
2297 */ 2185 */
2298 2186
2299int 2187int
2300find_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)
2301{ 2189{
2302 int 2190 int
2303 i; 2191 i;
2304 2192
2305 for (i = 0; i < SIZEOFFREE; i++) 2193 for (i = 0; i < SIZEOFFREE; i++)
… …
2369 * 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
2370 * there is capable of. 2258 * there is capable of.
2371 */ 2259 */
2372 2260
2373int 2261int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2262find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2263{
2376 int 2264 int
2377 i, 2265 i,
2378 max = SIZEOFFREE, mflags; 2266 max = SIZEOFFREE, mflags;
2379 2267
2380 sint16 nx, ny; 2268 sint16 nx, ny;
2381 object * 2269 object *
2382 tmp; 2270 tmp;
2383 mapstruct * 2271 maptile *
2384 mp; 2272 mp;
2385 2273
2386 MoveType blocked, move_type; 2274 MoveType blocked, move_type;
2387 2275
2388 if (exclude && exclude->head) 2276 if (exclude && exclude->head)
… …
2596 * Modified to be map tile aware -.MSW 2484 * Modified to be map tile aware -.MSW
2597 */ 2485 */
2598 2486
2599 2487
2600int 2488int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2489can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2490{
2603 sint16 dx, dy; 2491 sint16 dx, dy;
2604 int 2492 int
2605 mflags; 2493 mflags;
2606 2494
… …
2686 if (prev) 2574 if (prev)
2687 prev->more = tmp; 2575 prev->more = tmp;
2688 prev = tmp; 2576 prev = tmp;
2689 } 2577 }
2690 2578
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2579 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2580 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2581
2697 return dst; 2582 return dst;
2698} 2583}
2699 2584
2700/* return true if the object was destroyed, 0 otherwise */
2701int
2702was_destroyed (const object *op, tag_t old_tag)
2703{
2704 /* checking for FLAG_FREED isn't necessary, but makes this function more
2705 * robust */
2706 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2707}
2708
2709/* GROS - Creates an object using a string representing its content. */ 2585/* GROS - Creates an object using a string representing its content. */
2710
2711/* 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 */
2712
2713/* 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, */
2714
2715/* 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. */
2716
2717/* 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. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2590/* Also remember that multiparts objects are not supported for now. */
2720 2591
2721object * 2592object *
2722load_object_str (const char *obstr) 2593load_object_str (const char *obstr)
2723{ 2594{
2724 object * 2595 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2596 char filename[MAX_BUF];
2728 2597
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2598 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2599
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2600 FILE *tempfile = fopen (filename, "w");
2733 2601
2734 if (tempfile == NULL) 2602 if (tempfile == NULL)
2735 { 2603 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2604 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2605 return NULL;
… …
2758 * returns NULL if no match. 2626 * returns NULL if no match.
2759 */ 2627 */
2760object * 2628object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2629find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2630{
2763 object * 2631 object *tmp;
2764 tmp;
2765 2632
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2633 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2634 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2635 return tmp;
2769 2636
… …
2777 * do the desired thing. 2644 * do the desired thing.
2778 */ 2645 */
2779key_value * 2646key_value *
2780get_ob_key_link (const object *ob, const char *key) 2647get_ob_key_link (const object *ob, const char *key)
2781{ 2648{
2782 key_value * 2649 key_value *link;
2783 link;
2784 2650
2785 for (link = ob->key_values; link != NULL; link = link->next) 2651 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2652 if (link->key == key)
2788 {
2789 return link; 2653 return link;
2790 }
2791 }
2792 2654
2793 return NULL; 2655 return NULL;
2794} 2656}
2795 2657
2796/* 2658/*

Diff Legend

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