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.44 by root, Thu Sep 14 17:29:27 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}
… …
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
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920} 844}
921 845
922object::object () 846object::object ()
923{ 847{
924 SET_FLAG (this, FLAG_REMOVED); 848 SET_FLAG (this, FLAG_REMOVED);
… …
936{ 860{
937 count = ++ob_count; 861 count = ++ob_count;
938 uuid = gen_uuid (); 862 uuid = gen_uuid ();
939 863
940 prev = 0; 864 prev = 0;
941 next = objects; 865 next = object::first;
942 866
943 if (objects) 867 if (object::first)
944 objects->prev = this; 868 object::first->prev = this;
945 869
946 objects = this; 870 object::first = this;
947} 871}
948 872
949void object::unlink () 873void object::unlink ()
950{ 874{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 875 if (this == object::first)
955 objects = next; 876 object::first = next;
956 877
957 /* Remove this object from the list of used objects */ 878 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 879 if (prev) prev->next = next;
959 if (next) next->prev = prev; 880 if (next) next->prev = prev;
960 881
… …
974 * 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
975 * free objects. The IS_FREED() flag is set in the object. 896 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 897 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 898 * this function to succeed.
978 * 899 *
979 * 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
980 * inventory to the ground. 901 * inventory to the ground.
981 */ 902 */
982void object::free (bool free_inventory) 903void object::destroy (bool destroy_inventory)
983{ 904{
984 if (QUERY_FLAG (this, FLAG_FREED)) 905 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 906 return;
986 907
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 908 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
992 913
993 SET_FLAG (this, FLAG_FREED); 914 SET_FLAG (this, FLAG_FREED);
994 915
995 if (more) 916 if (more)
996 { 917 {
997 more->free (free_inventory); 918 more->destroy (destroy_inventory);
998 more = 0; 919 more = 0;
999 } 920 }
1000 921
1001 if (inv) 922 if (inv)
1002 { 923 {
1003 /* Only if the space blocks everything do we not process - 924 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 925 * if some form of movement is allowed, let objects
1005 * drop on that space. 926 * drop on that space.
1006 */ 927 */
1007 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)
1008 { 929 {
1009 object *op = inv; 930 object *op = inv;
1010 931
1011 while (op) 932 while (op)
1012 { 933 {
1013 object *tmp = op->below; 934 object *tmp = op->below;
1014 op->free (free_inventory); 935 op->destroy (destroy_inventory);
1015 op = tmp; 936 op = tmp;
1016 } 937 }
1017 } 938 }
1018 else 939 else
1019 { /* Put objects in inventory onto this space */ 940 { /* Put objects in inventory onto this space */
… …
1038 op = tmp; 959 op = tmp;
1039 } 960 }
1040 } 961 }
1041 } 962 }
1042 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
1043 // clear those pointers that likely might have circular references to us 984 // clear those pointers that likely might have circular references to us
1044 owner = 0; 985 owner = 0;
1045 enemy = 0; 986 enemy = 0;
1046 attacked_by = 0; 987 attacked_by = 0;
1047 988
989 // only relevant for players(?), but make sure of it anyways
990 contr = 0;
991
1048 /* Remove object from the active list */ 992 /* Remove object from the active list */
1049 speed = 0; 993 speed = 0;
1050 update_ob_speed (this); 994 update_ob_speed (this);
1051 995
1052 unlink (); 996 unlink ();
… …
1063sub_weight (object *op, signed long weight) 1007sub_weight (object *op, signed long weight)
1064{ 1008{
1065 while (op != NULL) 1009 while (op != NULL)
1066 { 1010 {
1067 if (op->type == CONTAINER) 1011 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1012 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1013
1071 op->carrying -= weight; 1014 op->carrying -= weight;
1072 op = op->env; 1015 op = op->env;
1073 } 1016 }
1074} 1017}
1075 1018
… …
1083 */ 1026 */
1084 1027
1085void 1028void
1086remove_ob (object *op) 1029remove_ob (object *op)
1087{ 1030{
1031 object *tmp, *last = 0;
1088 object * 1032 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1033
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1034 int check_walk_off;
1098 mapstruct * 1035 maptile *m;
1099 m;
1100 1036
1101 sint16 1037 sint16 x, y;
1102 x,
1103 y;
1104 1038
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1039 if (QUERY_FLAG (op, FLAG_REMOVED))
1106 return; 1040 return;
1107 1041
1108 SET_FLAG (op, FLAG_REMOVED); 1042 SET_FLAG (op, FLAG_REMOVED);
… …
1185 * use translated coordinates in case some oddness with map tiling is 1119 * use translated coordinates in case some oddness with map tiling is
1186 * evident 1120 * evident
1187 */ 1121 */
1188 if (GET_MAP_OB (m, x, y) != op) 1122 if (GET_MAP_OB (m, x, y) != op)
1189 { 1123 {
1190 dump_object (op); 1124 char *dump = dump_object (op);
1191 LOG (llevError, 1125 LOG (llevError,
1192 "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);
1193 dump_object (GET_MAP_OB (m, x, y)); 1128 dump = dump_object (GET_MAP_OB (m, x, y));
1194 LOG (llevError, "%s\n", errmsg); 1129 LOG (llevError, "%s\n", dump);
1130 free (dump);
1195 } 1131 }
1196 1132
1197 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. */
1198 } 1134 }
1199 1135
… …
1201 op->below = 0; 1137 op->below = 0;
1202 1138
1203 if (op->map->in_memory == MAP_SAVING) 1139 if (op->map->in_memory == MAP_SAVING)
1204 return; 1140 return;
1205 1141
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1142 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1208 1143
1209 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)
1210 { 1145 {
1211 /* 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
… …
1226 1161
1227 tmp->contr->socket.update_look = 1; 1162 tmp->contr->socket.update_look = 1;
1228 } 1163 }
1229 1164
1230 /* See if player moving off should effect something */ 1165 /* See if player moving off should effect something */
1231 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))
1232 { 1169 {
1233 move_apply (tmp, op, NULL); 1170 move_apply (tmp, op, NULL);
1234 1171
1235 if (was_destroyed (op, tag)) 1172 if (op->destroyed ())
1236 {
1237 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 ());
1238 }
1239 } 1174 }
1240 1175
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1176 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1177
1243 if (tmp->above == tmp) 1178 if (tmp->above == tmp)
… …
1296 free_object (op); 1231 free_object (op);
1297 return top; 1232 return top;
1298 } 1233 }
1299 } 1234 }
1300 1235
1301 return NULL; 1236 return 0;
1302} 1237}
1303 1238
1304/* 1239/*
1305 * 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
1306 * job preparing multi-part monsters 1241 * job preparing multi-part monsters
1307 */ 1242 */
1308object * 1243object *
1309insert_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)
1310{ 1245{
1311 object *tmp; 1246 object *tmp;
1312 1247
1313 if (op->head) 1248 if (op->head)
1314 op = op->head; 1249 op = op->head;
… …
1342 * NULL if 'op' was destroyed 1277 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1278 * just 'op' otherwise
1344 */ 1279 */
1345 1280
1346object * 1281object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1282insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1283{
1349 object *tmp, *top, *floor = NULL; 1284 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1285 sint16 x, y;
1351 1286
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1287 if (QUERY_FLAG (op, FLAG_FREED))
… …
1355 return NULL; 1290 return NULL;
1356 } 1291 }
1357 1292
1358 if (m == NULL) 1293 if (m == NULL)
1359 { 1294 {
1360 dump_object (op); 1295 char *dump = dump_object (op);
1361 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);
1362 return op; 1298 return op;
1363 } 1299 }
1364 1300
1365 if (out_of_map (m, op->x, op->y)) 1301 if (out_of_map (m, op->x, op->y))
1366 { 1302 {
1367 dump_object (op); 1303 char *dump = dump_object (op);
1368 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);
1369#ifdef MANY_CORES 1305#ifdef MANY_CORES
1370 /* 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
1371 * 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
1372 * improperly inserted. 1308 * improperly inserted.
1373 */ 1309 */
1374 abort (); 1310 abort ();
1375#endif 1311#endif
1312 free (dump);
1376 return op; 1313 return op;
1377 } 1314 }
1378 1315
1379 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1316 if (!QUERY_FLAG (op, FLAG_REMOVED))
1380 { 1317 {
1381 dump_object (op); 1318 char *dump = dump_object (op);
1382 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);
1383 return op; 1321 return op;
1384 } 1322 }
1385 1323
1386 if (op->more != NULL) 1324 if (op->more != NULL)
1387 { 1325 {
… …
1633 remove_ob (tmp); 1571 remove_ob (tmp);
1634 free_object (tmp); 1572 free_object (tmp);
1635 } 1573 }
1636 } 1574 }
1637 1575
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1576 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1577
1640 tmp1->x = op->x; 1578 tmp1->x = op->x;
1641 tmp1->y = op->y; 1579 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1580 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1581}
… …
1824 tmp, * 1762 tmp, *
1825 otmp; 1763 otmp;
1826 1764
1827 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1765 if (!QUERY_FLAG (op, FLAG_REMOVED))
1828 { 1766 {
1829 dump_object (op); 1767 char *dump = dump_object (op);
1830 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);
1831 return op; 1770 return op;
1832 } 1771 }
1833 1772
1834 if (where == NULL) 1773 if (where == NULL)
1835 { 1774 {
1836 dump_object (op); 1775 char *dump = dump_object (op);
1837 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);
1838 return op; 1778 return op;
1839 } 1779 }
1840 1780
1841 if (where->head) 1781 if (where->head)
1842 { 1782 {
… …
1942 */ 1882 */
1943 1883
1944int 1884int
1945check_move_on (object *op, object *originator) 1885check_move_on (object *op, object *originator)
1946{ 1886{
1947 object * 1887 object *tmp;
1948 tmp; 1888 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1889 int x = op->x, y = op->y;
1955 1890
1956 MoveType 1891 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1892
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1893 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1894 return 0;
1963
1964 tag = op->count;
1965 1895
1966 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);
1967 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);
1968 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);
1969 1899
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1960 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031 ((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))
2032 { 1962 {
2033 move_apply (tmp, op, originator); 1963 move_apply (tmp, op, originator);
2034 1964
2035 if (was_destroyed (op, tag)) 1965 if (op->destroyed ())
2036 return 1; 1966 return 1;
2037 1967
2038 /* what the person/creature stepped onto has moved the object 1968 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 1969 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 1970 * have a feeling strange problems would result.
… …
2052 * a matching archetype at the given map and coordinates. 1982 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 1983 * The first matching object is returned, or NULL if none.
2054 */ 1984 */
2055 1985
2056object * 1986object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 1987present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 1988{
2059 object * 1989 object *
2060 tmp; 1990 tmp;
2061 1991
2062 if (m == NULL || out_of_map (m, x, y)) 1992 if (m == NULL || out_of_map (m, x, y))
… …
2075 * a matching type variable at the given map and coordinates. 2005 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 2006 * The first matching object is returned, or NULL if none.
2077 */ 2007 */
2078 2008
2079object * 2009object *
2080present (unsigned char type, mapstruct *m, int x, int y) 2010present (unsigned char type, maptile *m, int x, int y)
2081{ 2011{
2082 object * 2012 object *
2083 tmp; 2013 tmp;
2084 2014
2085 if (out_of_map (m, x, y)) 2015 if (out_of_map (m, x, y))
… …
2225 * 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
2226 * customized, changed states, etc. 2156 * customized, changed states, etc.
2227 */ 2157 */
2228 2158
2229int 2159int
2230find_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)
2231{ 2161{
2232 int 2162 int
2233 i, 2163 i,
2234 index = 0, flag; 2164 index = 0, flag;
2235 static int 2165 static int
… …
2256 return -1; 2186 return -1;
2257 return altern[RANDOM () % index]; 2187 return altern[RANDOM () % index];
2258} 2188}
2259 2189
2260/* 2190/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2191 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2192 * find_free_spot(), but it will search max number of squares.
2263 * 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.
2264 * 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.
2265 */ 2195 */
2266 2196
2267int 2197int
2268find_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)
2269{ 2199{
2270 int 2200 int
2271 i; 2201 i;
2272 2202
2273 for (i = 0; i < SIZEOFFREE; i++) 2203 for (i = 0; i < SIZEOFFREE; i++)
… …
2337 * 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
2338 * there is capable of. 2268 * there is capable of.
2339 */ 2269 */
2340 2270
2341int 2271int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2272find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2273{
2344 int 2274 int
2345 i, 2275 i,
2346 max = SIZEOFFREE, mflags; 2276 max = SIZEOFFREE, mflags;
2347 2277
2348 sint16 nx, ny; 2278 sint16 nx, ny;
2349 object * 2279 object *
2350 tmp; 2280 tmp;
2351 mapstruct * 2281 maptile *
2352 mp; 2282 mp;
2353 2283
2354 MoveType blocked, move_type; 2284 MoveType blocked, move_type;
2355 2285
2356 if (exclude && exclude->head) 2286 if (exclude && exclude->head)
… …
2564 * Modified to be map tile aware -.MSW 2494 * Modified to be map tile aware -.MSW
2565 */ 2495 */
2566 2496
2567 2497
2568int 2498int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2499can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2500{
2571 sint16 dx, dy; 2501 sint16 dx, dy;
2572 int 2502 int
2573 mflags; 2503 mflags;
2574 2504
… …
2654 if (prev) 2584 if (prev)
2655 prev->more = tmp; 2585 prev->more = tmp;
2656 prev = tmp; 2586 prev = tmp;
2657 } 2587 }
2658 2588
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2589 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2590 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2591
2665 return dst; 2592 return dst;
2666} 2593}
2667 2594
2668/* return true if the object was destroyed, 0 otherwise */
2669int
2670was_destroyed (const object *op, tag_t old_tag)
2671{
2672 /* checking for FLAG_FREED isn't necessary, but makes this function more
2673 * robust */
2674 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675}
2676
2677/* GROS - Creates an object using a string representing its content. */ 2595/* GROS - Creates an object using a string representing its content. */
2678
2679/* 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 */
2680
2681/* 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, */
2682
2683/* 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. */
2684
2685/* 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. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2600/* Also remember that multiparts objects are not supported for now. */
2688 2601
2689object * 2602object *
2690load_object_str (const char *obstr) 2603load_object_str (const char *obstr)
2691{ 2604{
2692 object * 2605 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2606 char filename[MAX_BUF];
2696 2607
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2608 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2609
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2610 FILE *tempfile = fopen (filename, "w");
2701 2611
2702 if (tempfile == NULL) 2612 if (tempfile == NULL)
2703 { 2613 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2614 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2615 return NULL;
… …
2726 * returns NULL if no match. 2636 * returns NULL if no match.
2727 */ 2637 */
2728object * 2638object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2639find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2640{
2731 object * 2641 object *tmp;
2732 tmp;
2733 2642
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2643 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2644 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2645 return tmp;
2737 2646
… …
2745 * do the desired thing. 2654 * do the desired thing.
2746 */ 2655 */
2747key_value * 2656key_value *
2748get_ob_key_link (const object *ob, const char *key) 2657get_ob_key_link (const object *ob, const char *key)
2749{ 2658{
2750 key_value * 2659 key_value *link;
2751 link;
2752 2660
2753 for (link = ob->key_values; link != NULL; link = link->next) 2661 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2662 if (link->key == key)
2756 {
2757 return link; 2663 return link;
2758 }
2759 }
2760 2664
2761 return NULL; 2665 return NULL;
2762} 2666}
2763 2667
2764/* 2668/*

Diff Legend

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