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.43 by root, Thu Sep 14 17:10:24 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}
… …
895 825
896 if (op->more != NULL) 826 if (op->more != NULL)
897 update_object (op->more, action); 827 update_object (op->more, action);
898} 828}
899 829
900static unordered_vector<object *> mortals; 830object::vector object::mortals;
831object::vector object::objects; // not yet used
832object *object::first;
901 833
902void object::free_mortals () 834void object::free_mortals ()
903{ 835{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 837 if ((*i)->refcnt)
906 ++i; // further delay freeing 838 ++i; // further delay freeing
907 else 839 else
908 { 840 {
909 delete *i; 841 delete *i;
910 mortals.erase (i); 842 mortals.erase (i);
911 } 843 }
912 844
913 static int lastmortals = 0;//D 845 static int lastmortals = 0;//D
914 846
915 if (mortals.size() != lastmortals)//D 847 if (mortals.size() != lastmortals && lastmortals > 100)//D
916 { 848 {
917 lastmortals = mortals.size ();//D 849 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 } 851 }
920} 852}
… …
936{ 868{
937 count = ++ob_count; 869 count = ++ob_count;
938 uuid = gen_uuid (); 870 uuid = gen_uuid ();
939 871
940 prev = 0; 872 prev = 0;
941 next = objects; 873 next = object::first;
942 874
943 if (objects) 875 if (object::first)
944 objects->prev = this; 876 object::first->prev = this;
945 877
946 objects = this; 878 object::first = this;
947} 879}
948 880
949void object::unlink () 881void object::unlink ()
950{ 882{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 883 if (this == object::first)
955 objects = next; 884 object::first = next;
956 885
957 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 887 if (prev) prev->next = next;
959 if (next) next->prev = prev; 888 if (next) next->prev = prev;
960 889
… …
974 * 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
975 * free objects. The IS_FREED() flag is set in the object. 904 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 906 * this function to succeed.
978 * 907 *
979 * 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
980 * inventory to the ground. 909 * inventory to the ground.
981 */ 910 */
982void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
983{ 912{
984 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 914 return;
986 915
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 919 if (!QUERY_FLAG (this, FLAG_REMOVED))
991 remove_ob (this); 920 remove_ob (this);
992 921
993 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
994 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
995 if (more) 940 if (more)
996 { 941 {
997 more->free (free_inventory); 942 more->destroy (destroy_inventory);
998 more = 0; 943 more = 0;
999 } 944 }
1000 945
1001 if (inv) 946 if (inv)
1002 { 947 {
1003 /* Only if the space blocks everything do we not process - 948 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 949 * if some form of movement is allowed, let objects
1005 * drop on that space. 950 * drop on that space.
1006 */ 951 */
1007 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)
1008 { 953 {
1009 object *op = inv; 954 object *op = inv;
1010 955
1011 while (op) 956 while (op)
1012 { 957 {
1013 object *tmp = op->below; 958 object *tmp = op->below;
1014 op->free (free_inventory); 959 op->destroy (destroy_inventory);
1015 op = tmp; 960 op = tmp;
1016 } 961 }
1017 } 962 }
1018 else 963 else
1019 { /* Put objects in inventory onto this space */ 964 { /* Put objects in inventory onto this space */
… …
1038 op = tmp; 983 op = tmp;
1039 } 984 }
1040 } 985 }
1041 } 986 }
1042 987
988 // clear those pointers that likely might have circular references to us
1043 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;
1044 995
1045 /* Remove object from the active list */ 996 /* Remove object from the active list */
1046 speed = 0; 997 speed = 0;
1047 update_ob_speed (this); 998 update_ob_speed (this);
1048 999
… …
1060sub_weight (object *op, signed long weight) 1011sub_weight (object *op, signed long weight)
1061{ 1012{
1062 while (op != NULL) 1013 while (op != NULL)
1063 { 1014 {
1064 if (op->type == CONTAINER) 1015 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1016 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 } 1017
1068 op->carrying -= weight; 1018 op->carrying -= weight;
1069 op = op->env; 1019 op = op->env;
1070 } 1020 }
1071} 1021}
1072 1022
… …
1080 */ 1030 */
1081 1031
1082void 1032void
1083remove_ob (object *op) 1033remove_ob (object *op)
1084{ 1034{
1035 object *tmp, *last = 0;
1085 object * 1036 object *otmp;
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090 1037
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off; 1038 int check_walk_off;
1095 mapstruct * 1039 maptile *m;
1096 m;
1097 1040
1098 sint16 1041 sint16 x, y;
1099 x,
1100 y;
1101 1042
1102 if (QUERY_FLAG (op, FLAG_REMOVED)) 1043 if (QUERY_FLAG (op, FLAG_REMOVED))
1103 return; 1044 return;
1104 1045
1105 SET_FLAG (op, FLAG_REMOVED); 1046 SET_FLAG (op, FLAG_REMOVED);
… …
1182 * use translated coordinates in case some oddness with map tiling is 1123 * use translated coordinates in case some oddness with map tiling is
1183 * evident 1124 * evident
1184 */ 1125 */
1185 if (GET_MAP_OB (m, x, y) != op) 1126 if (GET_MAP_OB (m, x, y) != op)
1186 { 1127 {
1187 dump_object (op); 1128 char *dump = dump_object (op);
1188 LOG (llevError, 1129 LOG (llevError,
1189 "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);
1190 dump_object (GET_MAP_OB (m, x, y)); 1132 dump = dump_object (GET_MAP_OB (m, x, y));
1191 LOG (llevError, "%s\n", errmsg); 1133 LOG (llevError, "%s\n", dump);
1134 free (dump);
1192 } 1135 }
1193 1136
1194 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. */
1195 } 1138 }
1196 1139
… …
1198 op->below = 0; 1141 op->below = 0;
1199 1142
1200 if (op->map->in_memory == MAP_SAVING) 1143 if (op->map->in_memory == MAP_SAVING)
1201 return; 1144 return;
1202 1145
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1146 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1205 1147
1206 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)
1207 { 1149 {
1208 /* 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
… …
1223 1165
1224 tmp->contr->socket.update_look = 1; 1166 tmp->contr->socket.update_look = 1;
1225 } 1167 }
1226 1168
1227 /* See if player moving off should effect something */ 1169 /* See if player moving off should effect something */
1228 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))
1229 { 1173 {
1230 move_apply (tmp, op, NULL); 1174 move_apply (tmp, op, NULL);
1231 1175
1232 if (was_destroyed (op, tag)) 1176 if (op->destroyed ())
1233 {
1234 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 ());
1235 }
1236 } 1178 }
1237 1179
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1180 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1181
1240 if (tmp->above == tmp) 1182 if (tmp->above == tmp)
… …
1293 free_object (op); 1235 free_object (op);
1294 return top; 1236 return top;
1295 } 1237 }
1296 } 1238 }
1297 1239
1298 return NULL; 1240 return 0;
1299} 1241}
1300 1242
1301/* 1243/*
1302 * 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
1303 * job preparing multi-part monsters 1245 * job preparing multi-part monsters
1304 */ 1246 */
1305object * 1247object *
1306insert_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)
1307{ 1249{
1308 object *tmp; 1250 object *tmp;
1309 1251
1310 if (op->head) 1252 if (op->head)
1311 op = op->head; 1253 op = op->head;
… …
1339 * NULL if 'op' was destroyed 1281 * NULL if 'op' was destroyed
1340 * just 'op' otherwise 1282 * just 'op' otherwise
1341 */ 1283 */
1342 1284
1343object * 1285object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1287{
1346 object *tmp, *top, *floor = NULL; 1288 object *tmp, *top, *floor = NULL;
1347 sint16 x, y; 1289 sint16 x, y;
1348 1290
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1291 if (QUERY_FLAG (op, FLAG_FREED))
… …
1352 return NULL; 1294 return NULL;
1353 } 1295 }
1354 1296
1355 if (m == NULL) 1297 if (m == NULL)
1356 { 1298 {
1357 dump_object (op); 1299 char *dump = dump_object (op);
1358 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);
1359 return op; 1302 return op;
1360 } 1303 }
1361 1304
1362 if (out_of_map (m, op->x, op->y)) 1305 if (out_of_map (m, op->x, op->y))
1363 { 1306 {
1364 dump_object (op); 1307 char *dump = dump_object (op);
1365 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);
1366#ifdef MANY_CORES 1309#ifdef MANY_CORES
1367 /* 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
1368 * 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
1369 * improperly inserted. 1312 * improperly inserted.
1370 */ 1313 */
1371 abort (); 1314 abort ();
1372#endif 1315#endif
1316 free (dump);
1373 return op; 1317 return op;
1374 } 1318 }
1375 1319
1376 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1320 if (!QUERY_FLAG (op, FLAG_REMOVED))
1377 { 1321 {
1378 dump_object (op); 1322 char *dump = dump_object (op);
1379 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);
1380 return op; 1325 return op;
1381 } 1326 }
1382 1327
1383 if (op->more != NULL) 1328 if (op->more != NULL)
1384 { 1329 {
… …
1630 remove_ob (tmp); 1575 remove_ob (tmp);
1631 free_object (tmp); 1576 free_object (tmp);
1632 } 1577 }
1633 } 1578 }
1634 1579
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1580 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1581
1637 tmp1->x = op->x; 1582 tmp1->x = op->x;
1638 tmp1->y = op->y; 1583 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1584 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1585}
… …
1821 tmp, * 1766 tmp, *
1822 otmp; 1767 otmp;
1823 1768
1824 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1769 if (!QUERY_FLAG (op, FLAG_REMOVED))
1825 { 1770 {
1826 dump_object (op); 1771 char *dump = dump_object (op);
1827 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);
1828 return op; 1774 return op;
1829 } 1775 }
1830 1776
1831 if (where == NULL) 1777 if (where == NULL)
1832 { 1778 {
1833 dump_object (op); 1779 char *dump = dump_object (op);
1834 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);
1835 return op; 1782 return op;
1836 } 1783 }
1837 1784
1838 if (where->head) 1785 if (where->head)
1839 { 1786 {
… …
1939 */ 1886 */
1940 1887
1941int 1888int
1942check_move_on (object *op, object *originator) 1889check_move_on (object *op, object *originator)
1943{ 1890{
1944 object * 1891 object *tmp;
1945 tmp; 1892 maptile *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1893 int x = op->x, y = op->y;
1952 1894
1953 MoveType 1895 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1896
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1897 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1898 return 0;
1960
1961 tag = op->count;
1962 1899
1963 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);
1964 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);
1965 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);
1966 1903
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1964 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028 ((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))
2029 { 1966 {
2030 move_apply (tmp, op, originator); 1967 move_apply (tmp, op, originator);
2031 1968
2032 if (was_destroyed (op, tag)) 1969 if (op->destroyed ())
2033 return 1; 1970 return 1;
2034 1971
2035 /* what the person/creature stepped onto has moved the object 1972 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 1973 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 1974 * have a feeling strange problems would result.
… …
2049 * a matching archetype at the given map and coordinates. 1986 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 1987 * The first matching object is returned, or NULL if none.
2051 */ 1988 */
2052 1989
2053object * 1990object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 1991present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 1992{
2056 object * 1993 object *
2057 tmp; 1994 tmp;
2058 1995
2059 if (m == NULL || out_of_map (m, x, y)) 1996 if (m == NULL || out_of_map (m, x, y))
… …
2072 * a matching type variable at the given map and coordinates. 2009 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 2010 * The first matching object is returned, or NULL if none.
2074 */ 2011 */
2075 2012
2076object * 2013object *
2077present (unsigned char type, mapstruct *m, int x, int y) 2014present (unsigned char type, maptile *m, int x, int y)
2078{ 2015{
2079 object * 2016 object *
2080 tmp; 2017 tmp;
2081 2018
2082 if (out_of_map (m, x, y)) 2019 if (out_of_map (m, x, y))
… …
2222 * 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
2223 * customized, changed states, etc. 2160 * customized, changed states, etc.
2224 */ 2161 */
2225 2162
2226int 2163int
2227find_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)
2228{ 2165{
2229 int 2166 int
2230 i, 2167 i,
2231 index = 0, flag; 2168 index = 0, flag;
2232 static int 2169 static int
… …
2253 return -1; 2190 return -1;
2254 return altern[RANDOM () % index]; 2191 return altern[RANDOM () % index];
2255} 2192}
2256 2193
2257/* 2194/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2195 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2196 * find_free_spot(), but it will search max number of squares.
2260 * 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.
2261 * 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.
2262 */ 2199 */
2263 2200
2264int 2201int
2265find_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)
2266{ 2203{
2267 int 2204 int
2268 i; 2205 i;
2269 2206
2270 for (i = 0; i < SIZEOFFREE; i++) 2207 for (i = 0; i < SIZEOFFREE; i++)
… …
2334 * 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
2335 * there is capable of. 2272 * there is capable of.
2336 */ 2273 */
2337 2274
2338int 2275int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2276find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2277{
2341 int 2278 int
2342 i, 2279 i,
2343 max = SIZEOFFREE, mflags; 2280 max = SIZEOFFREE, mflags;
2344 2281
2345 sint16 nx, ny; 2282 sint16 nx, ny;
2346 object * 2283 object *
2347 tmp; 2284 tmp;
2348 mapstruct * 2285 maptile *
2349 mp; 2286 mp;
2350 2287
2351 MoveType blocked, move_type; 2288 MoveType blocked, move_type;
2352 2289
2353 if (exclude && exclude->head) 2290 if (exclude && exclude->head)
… …
2561 * Modified to be map tile aware -.MSW 2498 * Modified to be map tile aware -.MSW
2562 */ 2499 */
2563 2500
2564 2501
2565int 2502int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2503can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2504{
2568 sint16 dx, dy; 2505 sint16 dx, dy;
2569 int 2506 int
2570 mflags; 2507 mflags;
2571 2508
… …
2651 if (prev) 2588 if (prev)
2652 prev->more = tmp; 2589 prev->more = tmp;
2653 prev = tmp; 2590 prev = tmp;
2654 } 2591 }
2655 2592
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2593 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2594 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2595
2662 return dst; 2596 return dst;
2663} 2597}
2664 2598
2665/* return true if the object was destroyed, 0 otherwise */
2666int
2667was_destroyed (const object *op, tag_t old_tag)
2668{
2669 /* checking for FLAG_FREED isn't necessary, but makes this function more
2670 * robust */
2671 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672}
2673
2674/* GROS - Creates an object using a string representing its content. */ 2599/* GROS - Creates an object using a string representing its content. */
2675
2676/* 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 */
2677
2678/* 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, */
2679
2680/* 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. */
2681
2682/* 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. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2604/* Also remember that multiparts objects are not supported for now. */
2685 2605
2686object * 2606object *
2687load_object_str (const char *obstr) 2607load_object_str (const char *obstr)
2688{ 2608{
2689 object * 2609 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2610 char filename[MAX_BUF];
2693 2611
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2612 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2613
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2614 FILE *tempfile = fopen (filename, "w");
2698 2615
2699 if (tempfile == NULL) 2616 if (tempfile == NULL)
2700 { 2617 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2618 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2619 return NULL;
… …
2723 * returns NULL if no match. 2640 * returns NULL if no match.
2724 */ 2641 */
2725object * 2642object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2643find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2644{
2728 object * 2645 object *tmp;
2729 tmp;
2730 2646
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2647 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2648 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2649 return tmp;
2734 2650
… …
2742 * do the desired thing. 2658 * do the desired thing.
2743 */ 2659 */
2744key_value * 2660key_value *
2745get_ob_key_link (const object *ob, const char *key) 2661get_ob_key_link (const object *ob, const char *key)
2746{ 2662{
2747 key_value * 2663 key_value *link;
2748 link;
2749 2664
2750 for (link = ob->key_values; link != NULL; link = link->next) 2665 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2666 if (link->key == key)
2753 {
2754 return link; 2667 return link;
2755 }
2756 }
2757 2668
2758 return NULL; 2669 return NULL;
2759} 2670}
2760 2671
2761/* 2672/*

Diff Legend

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