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.40 by root, Thu Sep 14 00:07:15 2006 UTC vs.
Revision 1.55 by root, Sun Dec 3 00:41:33 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.
… …
481 */ 412 */
482 413
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 418 if (op->count == i)
490 break; 419 return op;
420
491 return op; 421 return 0;
492} 422}
493 423
494/* 424/*
495 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 431find_object_name (const char *str)
502{ 432{
503 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
504 object *op; 434 object *op;
505 435
506 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 437 if (op->name == str_)
508 break; 438 break;
509 439
510 return op; 440 return op;
511} 441}
512 442
513void 443void
514free_all_object_data () 444free_all_object_data ()
515{ 445{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 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} 447}
539 448
540/* 449/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 451 * skill and experience objects.
… …
612 521
613 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
614 523
615 expmul = 1.0; 524 expmul = 1.0;
616 face = blank_face; 525 face = blank_face;
617 attacked_by_count = -1;
618 526
619 if (settings.casting_time) 527 if (settings.casting_time)
620 casting_time = -1; 528 casting_time = -1;
621} 529}
622 530
… …
917 825
918 if (op->more != NULL) 826 if (op->more != NULL)
919 update_object (op->more, action); 827 update_object (op->more, action);
920} 828}
921 829
922static unordered_vector<object *> mortals; 830object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 831object::vector object::objects; // not yet used
832object *object::first;
924 833
925void object::free_mortals () 834void object::free_mortals ()
926{ 835{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 837 if ((*i)->refcnt)
929 ++i; // further delay freeing 838 ++i; // further delay freeing
930 else 839 else
931 { 840 {
932 //freed.push_back (*i);//D
933 delete *i; 841 delete *i;
934 mortals.erase (i); 842 mortals.erase (i);
935 } 843 }
936 844
937 if (mortals.size() && 0)//D 845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
939} 852}
940 853
941object::object () 854object::object ()
942{ 855{
943 SET_FLAG (this, FLAG_REMOVED); 856 SET_FLAG (this, FLAG_REMOVED);
944 857
945 expmul = 1.0; 858 expmul = 1.0;
946 face = blank_face; 859 face = blank_face;
947 attacked_by_count = -1;
948} 860}
949 861
950object::~object () 862object::~object ()
951{ 863{
952 free_key_values (this); 864 free_key_values (this);
953} 865}
954 866
955void object::link () 867void object::link ()
956{ 868{
957 count = ++ob_count; 869 count = ++ob_count;
870 uuid = gen_uuid ();
958 871
959 prev = 0; 872 prev = 0;
960 next = objects; 873 next = object::first;
961 874
962 if (objects) 875 if (object::first)
963 objects->prev = this; 876 object::first->prev = this;
964 877
965 objects = this; 878 object::first = this;
966} 879}
967 880
968void object::unlink () 881void object::unlink ()
969{ 882{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 883 if (this == object::first)
974 objects = next; 884 object::first = next;
975 885
976 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 887 if (prev) prev->next = next;
888 if (next) next->prev = prev;
889
980 prev = 0; 890 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 891 next = 0;
987 }
988} 892}
989 893
990object *object::create () 894object *object::create ()
991{ 895{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 896 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 (); 897 op->link ();
1006 return op; 898 return op;
1007} 899}
1008 900
1009/* 901/*
… …
1011 * it from the list of used objects, and puts it on the list of 903 * 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. 904 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
1014 * this function to succeed. 906 * this function to succeed.
1015 * 907 *
1016 * If free_inventory is set, free inventory as well. Else drop items in 908 * If destroy_inventory is set, free inventory as well. Else drop items in
1017 * inventory to the ground. 909 * inventory to the ground.
1018 */ 910 */
1019void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
1020{ 912{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
1022 return; 914 return;
1023 915
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1027 if (!QUERY_FLAG (this, FLAG_REMOVED)) 919 if (!QUERY_FLAG (this, FLAG_REMOVED))
1028 remove_ob (this); 920 remove_ob (this);
1029 921
1030 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
1031 923
924 // hack to ensure that freed objects still have a valid map
925 {
926 static maptile *freed_map; // freed objects are moved here to avoid crashes
927
928 if (!freed_map)
929 {
930 freed_map = get_empty_map (3, 3);
931 freed_map->name = "freed objects map";
932 allocate_map (freed_map);
933 }
934
935 map = freed_map;
936 x = 1;
937 y = 1;
938 }
939
1032 if (more) 940 if (more)
1033 { 941 {
1034 more->free (free_inventory); 942 more->destroy (destroy_inventory);
1035 more = 0; 943 more = 0;
1036 } 944 }
1037 945
1038 if (inv) 946 if (inv)
1039 { 947 {
1040 /* Only if the space blocks everything do we not process - 948 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 949 * if some form of movement is allowed, let objects
1042 * drop on that space. 950 * drop on that space.
1043 */ 951 */
1044 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 952 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1045 { 953 {
1046 object *op = inv; 954 object *op = inv;
1047 955
1048 while (op) 956 while (op)
1049 { 957 {
1050 object *tmp = op->below; 958 object *tmp = op->below;
1051 op->free (free_inventory); 959 op->destroy (destroy_inventory);
1052 op = tmp; 960 op = tmp;
1053 } 961 }
1054 } 962 }
1055 else 963 else
1056 { /* Put objects in inventory onto this space */ 964 { /* Put objects in inventory onto this space */
… …
1075 op = tmp; 983 op = tmp;
1076 } 984 }
1077 } 985 }
1078 } 986 }
1079 987
988 // clear those pointers that likely might have circular references to us
1080 owner = 0; 989 owner = 0;
990 enemy = 0;
991 attacked_by = 0;
992
993 // only relevant for players(?), but make sure of it anyways
994 contr = 0;
1081 995
1082 /* Remove object from the active list */ 996 /* Remove object from the active list */
1083 speed = 0; 997 speed = 0;
1084 update_ob_speed (this); 998 update_ob_speed (this);
1085 999
… …
1097sub_weight (object *op, signed long weight) 1011sub_weight (object *op, signed long weight)
1098{ 1012{
1099 while (op != NULL) 1013 while (op != NULL)
1100 { 1014 {
1101 if (op->type == CONTAINER) 1015 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1016 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 1017
1105 op->carrying -= weight; 1018 op->carrying -= weight;
1106 op = op->env; 1019 op = op->env;
1107 } 1020 }
1108} 1021}
1109 1022
… …
1117 */ 1030 */
1118 1031
1119void 1032void
1120remove_ob (object *op) 1033remove_ob (object *op)
1121{ 1034{
1035 object *tmp, *last = 0;
1122 object * 1036 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 1037
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off; 1038 int check_walk_off;
1132 mapstruct * 1039 maptile *m;
1133 m;
1134 1040
1135 sint16 1041 sint16 x, y;
1136 x,
1137 y;
1138 1042
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 1043 if (QUERY_FLAG (op, FLAG_REMOVED))
1140 return; 1044 return;
1141 1045
1142 SET_FLAG (op, FLAG_REMOVED); 1046 SET_FLAG (op, FLAG_REMOVED);
… …
1219 * use translated coordinates in case some oddness with map tiling is 1123 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1124 * evident
1221 */ 1125 */
1222 if (GET_MAP_OB (m, x, y) != op) 1126 if (GET_MAP_OB (m, x, y) != op)
1223 { 1127 {
1224 dump_object (op); 1128 char *dump = dump_object (op);
1225 LOG (llevError, 1129 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); 1130 "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);
1131 free (dump);
1227 dump_object (GET_MAP_OB (m, x, y)); 1132 dump = dump_object (GET_MAP_OB (m, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1133 LOG (llevError, "%s\n", dump);
1134 free (dump);
1229 } 1135 }
1230 1136
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1137 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1232 } 1138 }
1233 1139
… …
1235 op->below = 0; 1141 op->below = 0;
1236 1142
1237 if (op->map->in_memory == MAP_SAVING) 1143 if (op->map->in_memory == MAP_SAVING)
1238 return; 1144 return;
1239 1145
1240 tag = op->count;
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1146 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1242 1147
1243 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1148 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1244 { 1149 {
1245 /* No point updating the players look faces if he is the object 1150 /* No point updating the players look faces if he is the object
… …
1260 1165
1261 tmp->contr->socket.update_look = 1; 1166 tmp->contr->socket.update_look = 1;
1262 } 1167 }
1263 1168
1264 /* See if player moving off should effect something */ 1169 /* 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)) 1170 if (check_walk_off
1171 && ((op->move_type & tmp->move_off)
1172 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1173 {
1267 move_apply (tmp, op, NULL); 1174 move_apply (tmp, op, NULL);
1268 1175
1269 if (was_destroyed (op, tag)) 1176 if (op->destroyed ())
1270 {
1271 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1177 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272 }
1273 } 1178 }
1274 1179
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1180 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1181
1277 if (tmp->above == tmp) 1182 if (tmp->above == tmp)
… …
1330 free_object (op); 1235 free_object (op);
1331 return top; 1236 return top;
1332 } 1237 }
1333 } 1238 }
1334 1239
1335 return NULL; 1240 return 0;
1336} 1241}
1337 1242
1338/* 1243/*
1339 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1244 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1340 * job preparing multi-part monsters 1245 * job preparing multi-part monsters
1341 */ 1246 */
1342object * 1247object *
1343insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1248insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344{ 1249{
1345 object *tmp; 1250 object *tmp;
1346 1251
1347 if (op->head) 1252 if (op->head)
1348 op = op->head; 1253 op = op->head;
… …
1376 * NULL if 'op' was destroyed 1281 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1282 * just 'op' otherwise
1378 */ 1283 */
1379 1284
1380object * 1285object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1287{
1383 object *tmp, *top, *floor = NULL; 1288 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1289 sint16 x, y;
1385 1290
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1291 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1294 return NULL;
1390 } 1295 }
1391 1296
1392 if (m == NULL) 1297 if (m == NULL)
1393 { 1298 {
1394 dump_object (op); 1299 char *dump = dump_object (op);
1395 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1300 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1301 free (dump);
1396 return op; 1302 return op;
1397 } 1303 }
1398 1304
1399 if (out_of_map (m, op->x, op->y)) 1305 if (out_of_map (m, op->x, op->y))
1400 { 1306 {
1401 dump_object (op); 1307 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1308 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403#ifdef MANY_CORES 1309#ifdef MANY_CORES
1404 /* Better to catch this here, as otherwise the next use of this object 1310 /* 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 1311 * is likely to cause a crash. Better to find out where it is getting
1406 * improperly inserted. 1312 * improperly inserted.
1407 */ 1313 */
1408 abort (); 1314 abort ();
1409#endif 1315#endif
1316 free (dump);
1410 return op; 1317 return op;
1411 } 1318 }
1412 1319
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1320 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1321 {
1415 dump_object (op); 1322 char *dump = dump_object (op);
1416 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1323 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1324 free (dump);
1417 return op; 1325 return op;
1418 } 1326 }
1419 1327
1420 if (op->more != NULL) 1328 if (op->more != NULL)
1421 { 1329 {
… …
1667 remove_ob (tmp); 1575 remove_ob (tmp);
1668 free_object (tmp); 1576 free_object (tmp);
1669 } 1577 }
1670 } 1578 }
1671 1579
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1580 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1581
1674 tmp1->x = op->x; 1582 tmp1->x = op->x;
1675 tmp1->y = op->y; 1583 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1584 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1585}
… …
1858 tmp, * 1766 tmp, *
1859 otmp; 1767 otmp;
1860 1768
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1769 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1770 {
1863 dump_object (op); 1771 char *dump = dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1772 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773 free (dump);
1865 return op; 1774 return op;
1866 } 1775 }
1867 1776
1868 if (where == NULL) 1777 if (where == NULL)
1869 { 1778 {
1870 dump_object (op); 1779 char *dump = dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1780 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1781 free (dump);
1872 return op; 1782 return op;
1873 } 1783 }
1874 1784
1875 if (where->head) 1785 if (where->head)
1876 { 1786 {
… …
1976 */ 1886 */
1977 1887
1978int 1888int
1979check_move_on (object *op, object *originator) 1889check_move_on (object *op, object *originator)
1980{ 1890{
1981 object * 1891 object *tmp;
1982 tmp; 1892 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1893 int x = op->x, y = op->y;
1989 1894
1990 MoveType 1895 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1896
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1897 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1898 return 0;
1997
1998 tag = op->count;
1999 1899
2000 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1900 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); 1901 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); 1902 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003 1903
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1964 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)) 1965 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1966 {
2067 move_apply (tmp, op, originator); 1967 move_apply (tmp, op, originator);
2068 1968
2069 if (was_destroyed (op, tag)) 1969 if (op->destroyed ())
2070 return 1; 1970 return 1;
2071 1971
2072 /* what the person/creature stepped onto has moved the object 1972 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1973 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1974 * have a feeling strange problems would result.
… …
2086 * a matching archetype at the given map and coordinates. 1986 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1987 * The first matching object is returned, or NULL if none.
2088 */ 1988 */
2089 1989
2090object * 1990object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1991present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1992{
2093 object * 1993 object *
2094 tmp; 1994 tmp;
2095 1995
2096 if (m == NULL || out_of_map (m, x, y)) 1996 if (m == NULL || out_of_map (m, x, y))
… …
2109 * a matching type variable at the given map and coordinates. 2009 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 2010 * The first matching object is returned, or NULL if none.
2111 */ 2011 */
2112 2012
2113object * 2013object *
2114present (unsigned char type, mapstruct *m, int x, int y) 2014present (unsigned char type, maptile *m, int x, int y)
2115{ 2015{
2116 object * 2016 object *
2117 tmp; 2017 tmp;
2118 2018
2119 if (out_of_map (m, x, y)) 2019 if (out_of_map (m, x, y))
… …
2259 * the archetype because that isn't correct if the monster has been 2159 * the archetype because that isn't correct if the monster has been
2260 * customized, changed states, etc. 2160 * customized, changed states, etc.
2261 */ 2161 */
2262 2162
2263int 2163int
2264find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2164find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265{ 2165{
2266 int 2166 int
2267 i, 2167 i,
2268 index = 0, flag; 2168 index = 0, flag;
2269 static int 2169 static int
… …
2290 return -1; 2190 return -1;
2291 return altern[RANDOM () % index]; 2191 return altern[RANDOM () % index];
2292} 2192}
2293 2193
2294/* 2194/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2195 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2196 * find_free_spot(), but it will search max number of squares.
2297 * But it will return the first available spot, not a random choice. 2197 * 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. 2198 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2299 */ 2199 */
2300 2200
2301int 2201int
2302find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2202find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303{ 2203{
2304 int 2204 int
2305 i; 2205 i;
2306 2206
2307 for (i = 0; i < SIZEOFFREE; i++) 2207 for (i = 0; i < SIZEOFFREE; i++)
… …
2371 * because we have to know what movement the thing looking to move 2271 * because we have to know what movement the thing looking to move
2372 * there is capable of. 2272 * there is capable of.
2373 */ 2273 */
2374 2274
2375int 2275int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2276find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2277{
2378 int 2278 int
2379 i, 2279 i,
2380 max = SIZEOFFREE, mflags; 2280 max = SIZEOFFREE, mflags;
2381 2281
2382 sint16 nx, ny; 2282 sint16 nx, ny;
2383 object * 2283 object *
2384 tmp; 2284 tmp;
2385 mapstruct * 2285 maptile *
2386 mp; 2286 mp;
2387 2287
2388 MoveType blocked, move_type; 2288 MoveType blocked, move_type;
2389 2289
2390 if (exclude && exclude->head) 2290 if (exclude && exclude->head)
… …
2598 * Modified to be map tile aware -.MSW 2498 * Modified to be map tile aware -.MSW
2599 */ 2499 */
2600 2500
2601 2501
2602int 2502int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2503can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2504{
2605 sint16 dx, dy; 2505 sint16 dx, dy;
2606 int 2506 int
2607 mflags; 2507 mflags;
2608 2508
… …
2688 if (prev) 2588 if (prev)
2689 prev->more = tmp; 2589 prev->more = tmp;
2690 prev = tmp; 2590 prev = tmp;
2691 } 2591 }
2692 2592
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2593 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2594 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2595
2699 return dst; 2596 return dst;
2700} 2597}
2701 2598
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. */ 2599/* 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 */ 2600/* 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, */ 2601/* 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. */ 2602/* 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. */ 2603/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2604/* Also remember that multiparts objects are not supported for now. */
2722 2605
2723object * 2606object *
2724load_object_str (const char *obstr) 2607load_object_str (const char *obstr)
2725{ 2608{
2726 object * 2609 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2610 char filename[MAX_BUF];
2730 2611
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2612 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2613
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2614 FILE *tempfile = fopen (filename, "w");
2735 2615
2736 if (tempfile == NULL) 2616 if (tempfile == NULL)
2737 { 2617 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2618 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2619 return NULL;
2740 }; 2620 }
2621
2741 fprintf (tempfile, obstr); 2622 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2623 fclose (tempfile);
2743 2624
2744 op = get_object (); 2625 op = get_object ();
2745 2626
… …
2759 * returns NULL if no match. 2640 * returns NULL if no match.
2760 */ 2641 */
2761object * 2642object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2643find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2644{
2764 object * 2645 object *tmp;
2765 tmp;
2766 2646
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2647 for (tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2648 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2649 return tmp;
2770 2650
… …
2778 * do the desired thing. 2658 * do the desired thing.
2779 */ 2659 */
2780key_value * 2660key_value *
2781get_ob_key_link (const object *ob, const char *key) 2661get_ob_key_link (const object *ob, const char *key)
2782{ 2662{
2783 key_value * 2663 key_value *link;
2784 link;
2785 2664
2786 for (link = ob->key_values; link != NULL; link = link->next) 2665 for (link = ob->key_values; link != NULL; link = link->next)
2787 {
2788 if (link->key == key) 2666 if (link->key == key)
2789 {
2790 return link; 2667 return link;
2791 }
2792 }
2793 2668
2794 return NULL; 2669 return NULL;
2795} 2670}
2796 2671
2797/* 2672/*

Diff Legend

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