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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.58 by pippijn, Mon Dec 4 17:48:35 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;
831object::vector object::objects; // not yet used
832object *object::first;
923 833
924void object::free_mortals () 834void object::free_mortals ()
925{ 835{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 837 if ((*i)->refcnt)
928 ++i; // further delay freeing 838 ++i; // further delay freeing
929 else 839 else
930 { 840 {
931 delete *i; 841 delete *i;
932 mortals.erase (i); 842 mortals.erase (i);
933 } 843 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 844}
943 845
944object::object () 846object::object ()
945{ 847{
946 SET_FLAG (this, FLAG_REMOVED); 848 SET_FLAG (this, FLAG_REMOVED);
947 849
948 expmul = 1.0; 850 expmul = 1.0;
949 face = blank_face; 851 face = blank_face;
950 attacked_by_count = -1;
951} 852}
952 853
953object::~object () 854object::~object ()
954{ 855{
955 free_key_values (this); 856 free_key_values (this);
… …
959{ 860{
960 count = ++ob_count; 861 count = ++ob_count;
961 uuid = gen_uuid (); 862 uuid = gen_uuid ();
962 863
963 prev = 0; 864 prev = 0;
964 next = objects; 865 next = object::first;
965 866
966 if (objects) 867 if (object::first)
967 objects->prev = this; 868 object::first->prev = this;
968 869
969 objects = this; 870 object::first = this;
970} 871}
971 872
972void object::unlink () 873void object::unlink ()
973{ 874{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 875 if (this == object::first)
978 objects = next; 876 object::first = next;
979 877
980 /* Remove this object from the list of used objects */ 878 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 879 if (prev) prev->next = next;
982 if (next) next->prev = prev; 880 if (next) next->prev = prev;
983 881
… …
997 * it from the list of used objects, and puts it on the list of 895 * it from the list of used objects, and puts it on the list of
998 * free objects. The IS_FREED() flag is set in the object. 896 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 897 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 898 * this function to succeed.
1001 * 899 *
1002 * If free_inventory is set, free inventory as well. Else drop items in 900 * If destroy_inventory is set, free inventory as well. Else drop items in
1003 * inventory to the ground. 901 * inventory to the ground.
1004 */ 902 */
1005void object::free (bool free_inventory) 903void object::destroy (bool destroy_inventory)
1006{ 904{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 905 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 906 return;
1009 907
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 908 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1015 913
1016 SET_FLAG (this, FLAG_FREED); 914 SET_FLAG (this, FLAG_FREED);
1017 915
1018 if (more) 916 if (more)
1019 { 917 {
1020 more->free (free_inventory); 918 more->destroy (destroy_inventory);
1021 more = 0; 919 more = 0;
1022 } 920 }
1023 921
1024 if (inv) 922 if (inv)
1025 { 923 {
1026 /* Only if the space blocks everything do we not process - 924 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 925 * if some form of movement is allowed, let objects
1028 * drop on that space. 926 * drop on that space.
1029 */ 927 */
1030 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 928 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1031 { 929 {
1032 object *op = inv; 930 object *op = inv;
1033 931
1034 while (op) 932 while (op)
1035 { 933 {
1036 object *tmp = op->below; 934 object *tmp = op->below;
1037 op->free (free_inventory); 935 op->destroy (destroy_inventory);
1038 op = tmp; 936 op = tmp;
1039 } 937 }
1040 } 938 }
1041 else 939 else
1042 { /* Put objects in inventory onto this space */ 940 { /* Put objects in inventory onto this space */
… …
1061 op = tmp; 959 op = tmp;
1062 } 960 }
1063 } 961 }
1064 } 962 }
1065 963
964 // hack to ensure that freed objects still have a valid map
965 {
966 static maptile *freed_map; // freed objects are moved here to avoid crashes
967
968 if (!freed_map)
969 {
970 freed_map = new maptile;
971
972 freed_map->name = "/internal/freed_objects_map";
973 freed_map->width = 3;
974 freed_map->height = 3;
975
976 freed_map->allocate ();
977 }
978
979 map = freed_map;
980 x = 1;
981 y = 1;
982 }
983
984 // clear those pointers that likely might have circular references to us
1066 owner = 0; 985 owner = 0;
986 enemy = 0;
987 attacked_by = 0;
988
989 // only relevant for players(?), but make sure of it anyways
990 contr = 0;
1067 991
1068 /* Remove object from the active list */ 992 /* Remove object from the active list */
1069 speed = 0; 993 speed = 0;
1070 update_ob_speed (this); 994 update_ob_speed (this);
1071 995
… …
1083sub_weight (object *op, signed long weight) 1007sub_weight (object *op, signed long weight)
1084{ 1008{
1085 while (op != NULL) 1009 while (op != NULL)
1086 { 1010 {
1087 if (op->type == CONTAINER) 1011 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1012 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1013
1091 op->carrying -= weight; 1014 op->carrying -= weight;
1092 op = op->env; 1015 op = op->env;
1093 } 1016 }
1094} 1017}
1095 1018
… …
1103 */ 1026 */
1104 1027
1105void 1028void
1106remove_ob (object *op) 1029remove_ob (object *op)
1107{ 1030{
1031 object *tmp, *last = 0;
1108 object * 1032 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1033
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1034 int check_walk_off;
1118 mapstruct * 1035 maptile *m;
1119 m;
1120 1036
1121 sint16 1037 sint16 x, y;
1122 x,
1123 y;
1124 1038
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1039 if (QUERY_FLAG (op, FLAG_REMOVED))
1126 return; 1040 return;
1127 1041
1128 SET_FLAG (op, FLAG_REMOVED); 1042 SET_FLAG (op, FLAG_REMOVED);
… …
1205 * use translated coordinates in case some oddness with map tiling is 1119 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1120 * evident
1207 */ 1121 */
1208 if (GET_MAP_OB (m, x, y) != op) 1122 if (GET_MAP_OB (m, x, y) != op)
1209 { 1123 {
1210 dump_object (op); 1124 char *dump = dump_object (op);
1211 LOG (llevError, 1125 LOG (llevError,
1212 "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); 1126 "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);
1127 free (dump);
1213 dump_object (GET_MAP_OB (m, x, y)); 1128 dump = dump_object (GET_MAP_OB (m, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1129 LOG (llevError, "%s\n", dump);
1130 free (dump);
1215 } 1131 }
1216 1132
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1133 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1218 } 1134 }
1219 1135
… …
1221 op->below = 0; 1137 op->below = 0;
1222 1138
1223 if (op->map->in_memory == MAP_SAVING) 1139 if (op->map->in_memory == MAP_SAVING)
1224 return; 1140 return;
1225 1141
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1228 1143
1229 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1144 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1230 { 1145 {
1231 /* No point updating the players look faces if he is the object 1146 /* No point updating the players look faces if he is the object
… …
1246 1161
1247 tmp->contr->socket.update_look = 1; 1162 tmp->contr->socket.update_look = 1;
1248 } 1163 }
1249 1164
1250 /* See if player moving off should effect something */ 1165 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1166 if (check_walk_off
1167 && ((op->move_type & tmp->move_off)
1168 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1169 {
1253 move_apply (tmp, op, NULL); 1170 move_apply (tmp, op, NULL);
1254 1171
1255 if (was_destroyed (op, tag)) 1172 if (op->destroyed ())
1256 {
1257 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1173 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1258 }
1259 } 1174 }
1260 1175
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1177
1263 if (tmp->above == tmp) 1178 if (tmp->above == tmp)
… …
1316 free_object (op); 1231 free_object (op);
1317 return top; 1232 return top;
1318 } 1233 }
1319 } 1234 }
1320 1235
1321 return NULL; 1236 return 0;
1322} 1237}
1323 1238
1324/* 1239/*
1325 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1240 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1326 * job preparing multi-part monsters 1241 * job preparing multi-part monsters
1327 */ 1242 */
1328object * 1243object *
1329insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1244insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1330{ 1245{
1331 object *tmp; 1246 object *tmp;
1332 1247
1333 if (op->head) 1248 if (op->head)
1334 op = op->head; 1249 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1277 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1278 * just 'op' otherwise
1364 */ 1279 */
1365 1280
1366object * 1281object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1282insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1283{
1369 object *tmp, *top, *floor = NULL; 1284 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1285 sint16 x, y;
1371 1286
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1287 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1290 return NULL;
1376 } 1291 }
1377 1292
1378 if (m == NULL) 1293 if (m == NULL)
1379 { 1294 {
1380 dump_object (op); 1295 char *dump = dump_object (op);
1381 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1296 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1297 free (dump);
1382 return op; 1298 return op;
1383 } 1299 }
1384 1300
1385 if (out_of_map (m, op->x, op->y)) 1301 if (out_of_map (m, op->x, op->y))
1386 { 1302 {
1387 dump_object (op); 1303 char *dump = dump_object (op);
1388 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1304 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1389#ifdef MANY_CORES 1305#ifdef MANY_CORES
1390 /* Better to catch this here, as otherwise the next use of this object 1306 /* Better to catch this here, as otherwise the next use of this object
1391 * is likely to cause a crash. Better to find out where it is getting 1307 * is likely to cause a crash. Better to find out where it is getting
1392 * improperly inserted. 1308 * improperly inserted.
1393 */ 1309 */
1394 abort (); 1310 abort ();
1395#endif 1311#endif
1312 free (dump);
1396 return op; 1313 return op;
1397 } 1314 }
1398 1315
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1316 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1317 {
1401 dump_object (op); 1318 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1319 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1320 free (dump);
1403 return op; 1321 return op;
1404 } 1322 }
1405 1323
1406 if (op->more != NULL) 1324 if (op->more != NULL)
1407 { 1325 {
… …
1653 remove_ob (tmp); 1571 remove_ob (tmp);
1654 free_object (tmp); 1572 free_object (tmp);
1655 } 1573 }
1656 } 1574 }
1657 1575
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1576 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1577
1660 tmp1->x = op->x; 1578 tmp1->x = op->x;
1661 tmp1->y = op->y; 1579 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1580 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1581}
… …
1844 tmp, * 1762 tmp, *
1845 otmp; 1763 otmp;
1846 1764
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1766 {
1849 dump_object (op); 1767 char *dump = dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1768 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1769 free (dump);
1851 return op; 1770 return op;
1852 } 1771 }
1853 1772
1854 if (where == NULL) 1773 if (where == NULL)
1855 { 1774 {
1856 dump_object (op); 1775 char *dump = dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1776 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1777 free (dump);
1858 return op; 1778 return op;
1859 } 1779 }
1860 1780
1861 if (where->head) 1781 if (where->head)
1862 { 1782 {
… …
1962 */ 1882 */
1963 1883
1964int 1884int
1965check_move_on (object *op, object *originator) 1885check_move_on (object *op, object *originator)
1966{ 1886{
1967 object * 1887 object *tmp;
1968 tmp; 1888 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1889 int x = op->x, y = op->y;
1975 1890
1976 MoveType 1891 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1892
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1893 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1894 return 0;
1983
1984 tag = op->count;
1985 1895
1986 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1896 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1987 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1897 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1988 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1898 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1989 1899
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1960 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1961 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1962 {
2053 move_apply (tmp, op, originator); 1963 move_apply (tmp, op, originator);
2054 1964
2055 if (was_destroyed (op, tag)) 1965 if (op->destroyed ())
2056 return 1; 1966 return 1;
2057 1967
2058 /* what the person/creature stepped onto has moved the object 1968 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1969 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1970 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1982 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1983 * The first matching object is returned, or NULL if none.
2074 */ 1984 */
2075 1985
2076object * 1986object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1987present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1988{
2079 object * 1989 object *
2080 tmp; 1990 tmp;
2081 1991
2082 if (m == NULL || out_of_map (m, x, y)) 1992 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 2005 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 2006 * The first matching object is returned, or NULL if none.
2097 */ 2007 */
2098 2008
2099object * 2009object *
2100present (unsigned char type, mapstruct *m, int x, int y) 2010present (unsigned char type, maptile *m, int x, int y)
2101{ 2011{
2102 object * 2012 object *
2103 tmp; 2013 tmp;
2104 2014
2105 if (out_of_map (m, x, y)) 2015 if (out_of_map (m, x, y))
… …
2245 * the archetype because that isn't correct if the monster has been 2155 * the archetype because that isn't correct if the monster has been
2246 * customized, changed states, etc. 2156 * customized, changed states, etc.
2247 */ 2157 */
2248 2158
2249int 2159int
2250find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2160find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2251{ 2161{
2252 int 2162 int
2253 i, 2163 i,
2254 index = 0, flag; 2164 index = 0, flag;
2255 static int 2165 static int
… …
2276 return -1; 2186 return -1;
2277 return altern[RANDOM () % index]; 2187 return altern[RANDOM () % index];
2278} 2188}
2279 2189
2280/* 2190/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2191 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2192 * find_free_spot(), but it will search max number of squares.
2283 * But it will return the first available spot, not a random choice. 2193 * But it will return the first available spot, not a random choice.
2284 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2194 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2285 */ 2195 */
2286 2196
2287int 2197int
2288find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2198find_first_free_spot (const object *ob, maptile *m, int x, int y)
2289{ 2199{
2290 int 2200 int
2291 i; 2201 i;
2292 2202
2293 for (i = 0; i < SIZEOFFREE; i++) 2203 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * because we have to know what movement the thing looking to move 2267 * because we have to know what movement the thing looking to move
2358 * there is capable of. 2268 * there is capable of.
2359 */ 2269 */
2360 2270
2361int 2271int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2272find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2273{
2364 int 2274 int
2365 i, 2275 i,
2366 max = SIZEOFFREE, mflags; 2276 max = SIZEOFFREE, mflags;
2367 2277
2368 sint16 nx, ny; 2278 sint16 nx, ny;
2369 object * 2279 object *
2370 tmp; 2280 tmp;
2371 mapstruct * 2281 maptile *
2372 mp; 2282 mp;
2373 2283
2374 MoveType blocked, move_type; 2284 MoveType blocked, move_type;
2375 2285
2376 if (exclude && exclude->head) 2286 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2494 * Modified to be map tile aware -.MSW
2585 */ 2495 */
2586 2496
2587 2497
2588int 2498int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2499can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2500{
2591 sint16 dx, dy; 2501 sint16 dx, dy;
2592 int 2502 int
2593 mflags; 2503 mflags;
2594 2504
… …
2674 if (prev) 2584 if (prev)
2675 prev->more = tmp; 2585 prev->more = tmp;
2676 prev = tmp; 2586 prev = tmp;
2677 } 2587 }
2678 2588
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2589 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2590 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2591
2685 return dst; 2592 return dst;
2686} 2593}
2687 2594
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2595/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2596/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2597/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2598/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2599/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2600/* Also remember that multiparts objects are not supported for now. */
2708 2601
2709object * 2602object *
2710load_object_str (const char *obstr) 2603load_object_str (const char *obstr)
2711{ 2604{
2712 object * 2605 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2606 char filename[MAX_BUF];
2716 2607
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2608 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2609
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2610 FILE *tempfile = fopen (filename, "w");
2721 2611
2722 if (tempfile == NULL) 2612 if (tempfile == NULL)
2723 { 2613 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2614 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2615 return NULL;
… …
2746 * returns NULL if no match. 2636 * returns NULL if no match.
2747 */ 2637 */
2748object * 2638object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2639find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2640{
2751 object * 2641 object *tmp;
2752 tmp;
2753 2642
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2643 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2644 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2645 return tmp;
2757 2646
… …
2765 * do the desired thing. 2654 * do the desired thing.
2766 */ 2655 */
2767key_value * 2656key_value *
2768get_ob_key_link (const object *ob, const char *key) 2657get_ob_key_link (const object *ob, const char *key)
2769{ 2658{
2770 key_value * 2659 key_value *link;
2771 link;
2772 2660
2773 for (link = ob->key_values; link != NULL; link = link->next) 2661 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2662 if (link->key == key)
2776 {
2777 return link; 2663 return link;
2778 }
2779 }
2780 2664
2781 return NULL; 2665 return NULL;
2782} 2666}
2783 2667
2784/* 2668/*

Diff Legend

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