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.57 by root, Sun Dec 3 02:46: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))
… …
992 921
993 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
994 923
995 if (more) 924 if (more)
996 { 925 {
997 more->free (free_inventory); 926 more->destroy (destroy_inventory);
998 more = 0; 927 more = 0;
999 } 928 }
1000 929
1001 if (inv) 930 if (inv)
1002 { 931 {
1003 /* Only if the space blocks everything do we not process - 932 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 933 * if some form of movement is allowed, let objects
1005 * drop on that space. 934 * drop on that space.
1006 */ 935 */
1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 936 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008 { 937 {
1009 object *op = inv; 938 object *op = inv;
1010 939
1011 while (op) 940 while (op)
1012 { 941 {
1013 object *tmp = op->below; 942 object *tmp = op->below;
1014 op->free (free_inventory); 943 op->destroy (destroy_inventory);
1015 op = tmp; 944 op = tmp;
1016 } 945 }
1017 } 946 }
1018 else 947 else
1019 { /* Put objects in inventory onto this space */ 948 { /* Put objects in inventory onto this space */
… …
1038 op = tmp; 967 op = tmp;
1039 } 968 }
1040 } 969 }
1041 } 970 }
1042 971
972 // hack to ensure that freed objects still have a valid map
973 {
974 static maptile *freed_map; // freed objects are moved here to avoid crashes
975
976 if (!freed_map)
977 {
978 freed_map = new maptile;
979
980 freed_map->name = "/internal/freed_objects_map";
981 freed_map->width = 3;
982 freed_map->height = 3;
983
984 freed_map->allocate ();
985 }
986
987 map = freed_map;
988 x = 1;
989 y = 1;
990 }
991
1043 // clear those pointers that likely might have circular references to us 992 // clear those pointers that likely might have circular references to us
1044 owner = 0; 993 owner = 0;
1045 enemy = 0; 994 enemy = 0;
1046 attacked_by = 0; 995 attacked_by = 0;
1047 996
997 // only relevant for players(?), but make sure of it anyways
998 contr = 0;
999
1048 /* Remove object from the active list */ 1000 /* Remove object from the active list */
1049 speed = 0; 1001 speed = 0;
1050 update_ob_speed (this); 1002 update_ob_speed (this);
1051 1003
1052 unlink (); 1004 unlink ();
… …
1063sub_weight (object *op, signed long weight) 1015sub_weight (object *op, signed long weight)
1064{ 1016{
1065 while (op != NULL) 1017 while (op != NULL)
1066 { 1018 {
1067 if (op->type == CONTAINER) 1019 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1020 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1021
1071 op->carrying -= weight; 1022 op->carrying -= weight;
1072 op = op->env; 1023 op = op->env;
1073 } 1024 }
1074} 1025}
1075 1026
… …
1083 */ 1034 */
1084 1035
1085void 1036void
1086remove_ob (object *op) 1037remove_ob (object *op)
1087{ 1038{
1039 object *tmp, *last = 0;
1088 object * 1040 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1041
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1042 int check_walk_off;
1098 mapstruct * 1043 maptile *m;
1099 m;
1100 1044
1101 sint16 1045 sint16 x, y;
1102 x,
1103 y;
1104 1046
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1047 if (QUERY_FLAG (op, FLAG_REMOVED))
1106 return; 1048 return;
1107 1049
1108 SET_FLAG (op, FLAG_REMOVED); 1050 SET_FLAG (op, FLAG_REMOVED);
… …
1185 * use translated coordinates in case some oddness with map tiling is 1127 * use translated coordinates in case some oddness with map tiling is
1186 * evident 1128 * evident
1187 */ 1129 */
1188 if (GET_MAP_OB (m, x, y) != op) 1130 if (GET_MAP_OB (m, x, y) != op)
1189 { 1131 {
1190 dump_object (op); 1132 char *dump = dump_object (op);
1191 LOG (llevError, 1133 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); 1134 "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);
1135 free (dump);
1193 dump_object (GET_MAP_OB (m, x, y)); 1136 dump = dump_object (GET_MAP_OB (m, x, y));
1194 LOG (llevError, "%s\n", errmsg); 1137 LOG (llevError, "%s\n", dump);
1138 free (dump);
1195 } 1139 }
1196 1140
1197 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1141 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1198 } 1142 }
1199 1143
… …
1201 op->below = 0; 1145 op->below = 0;
1202 1146
1203 if (op->map->in_memory == MAP_SAVING) 1147 if (op->map->in_memory == MAP_SAVING)
1204 return; 1148 return;
1205 1149
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1150 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1208 1151
1209 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1152 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1210 { 1153 {
1211 /* No point updating the players look faces if he is the object 1154 /* No point updating the players look faces if he is the object
… …
1226 1169
1227 tmp->contr->socket.update_look = 1; 1170 tmp->contr->socket.update_look = 1;
1228 } 1171 }
1229 1172
1230 /* See if player moving off should effect something */ 1173 /* 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)) 1174 if (check_walk_off
1175 && ((op->move_type & tmp->move_off)
1176 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1232 { 1177 {
1233 move_apply (tmp, op, NULL); 1178 move_apply (tmp, op, NULL);
1234 1179
1235 if (was_destroyed (op, tag)) 1180 if (op->destroyed ())
1236 {
1237 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1181 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1238 }
1239 } 1182 }
1240 1183
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1184 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1185
1243 if (tmp->above == tmp) 1186 if (tmp->above == tmp)
… …
1296 free_object (op); 1239 free_object (op);
1297 return top; 1240 return top;
1298 } 1241 }
1299 } 1242 }
1300 1243
1301 return NULL; 1244 return 0;
1302} 1245}
1303 1246
1304/* 1247/*
1305 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1248 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1306 * job preparing multi-part monsters 1249 * job preparing multi-part monsters
1307 */ 1250 */
1308object * 1251object *
1309insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1252insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1310{ 1253{
1311 object *tmp; 1254 object *tmp;
1312 1255
1313 if (op->head) 1256 if (op->head)
1314 op = op->head; 1257 op = op->head;
… …
1342 * NULL if 'op' was destroyed 1285 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1286 * just 'op' otherwise
1344 */ 1287 */
1345 1288
1346object * 1289object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1290insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1291{
1349 object *tmp, *top, *floor = NULL; 1292 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1293 sint16 x, y;
1351 1294
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1295 if (QUERY_FLAG (op, FLAG_FREED))
… …
1355 return NULL; 1298 return NULL;
1356 } 1299 }
1357 1300
1358 if (m == NULL) 1301 if (m == NULL)
1359 { 1302 {
1360 dump_object (op); 1303 char *dump = dump_object (op);
1361 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1304 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1305 free (dump);
1362 return op; 1306 return op;
1363 } 1307 }
1364 1308
1365 if (out_of_map (m, op->x, op->y)) 1309 if (out_of_map (m, op->x, op->y))
1366 { 1310 {
1367 dump_object (op); 1311 char *dump = dump_object (op);
1368 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1312 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1369#ifdef MANY_CORES 1313#ifdef MANY_CORES
1370 /* Better to catch this here, as otherwise the next use of this object 1314 /* 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 1315 * is likely to cause a crash. Better to find out where it is getting
1372 * improperly inserted. 1316 * improperly inserted.
1373 */ 1317 */
1374 abort (); 1318 abort ();
1375#endif 1319#endif
1320 free (dump);
1376 return op; 1321 return op;
1377 } 1322 }
1378 1323
1379 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1324 if (!QUERY_FLAG (op, FLAG_REMOVED))
1380 { 1325 {
1381 dump_object (op); 1326 char *dump = dump_object (op);
1382 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1327 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1328 free (dump);
1383 return op; 1329 return op;
1384 } 1330 }
1385 1331
1386 if (op->more != NULL) 1332 if (op->more != NULL)
1387 { 1333 {
… …
1633 remove_ob (tmp); 1579 remove_ob (tmp);
1634 free_object (tmp); 1580 free_object (tmp);
1635 } 1581 }
1636 } 1582 }
1637 1583
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1584 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1585
1640 tmp1->x = op->x; 1586 tmp1->x = op->x;
1641 tmp1->y = op->y; 1587 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1588 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1589}
… …
1824 tmp, * 1770 tmp, *
1825 otmp; 1771 otmp;
1826 1772
1827 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1773 if (!QUERY_FLAG (op, FLAG_REMOVED))
1828 { 1774 {
1829 dump_object (op); 1775 char *dump = dump_object (op);
1830 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1776 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777 free (dump);
1831 return op; 1778 return op;
1832 } 1779 }
1833 1780
1834 if (where == NULL) 1781 if (where == NULL)
1835 { 1782 {
1836 dump_object (op); 1783 char *dump = dump_object (op);
1837 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1784 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1785 free (dump);
1838 return op; 1786 return op;
1839 } 1787 }
1840 1788
1841 if (where->head) 1789 if (where->head)
1842 { 1790 {
… …
1942 */ 1890 */
1943 1891
1944int 1892int
1945check_move_on (object *op, object *originator) 1893check_move_on (object *op, object *originator)
1946{ 1894{
1947 object * 1895 object *tmp;
1948 tmp; 1896 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1897 int x = op->x, y = op->y;
1955 1898
1956 MoveType 1899 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1900
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1901 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1902 return 0;
1963
1964 tag = op->count;
1965 1903
1966 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1904 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); 1905 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); 1906 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1969 1907
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1968 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)) 1969 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2032 { 1970 {
2033 move_apply (tmp, op, originator); 1971 move_apply (tmp, op, originator);
2034 1972
2035 if (was_destroyed (op, tag)) 1973 if (op->destroyed ())
2036 return 1; 1974 return 1;
2037 1975
2038 /* what the person/creature stepped onto has moved the object 1976 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 1977 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 1978 * have a feeling strange problems would result.
… …
2052 * a matching archetype at the given map and coordinates. 1990 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 1991 * The first matching object is returned, or NULL if none.
2054 */ 1992 */
2055 1993
2056object * 1994object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 1995present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 1996{
2059 object * 1997 object *
2060 tmp; 1998 tmp;
2061 1999
2062 if (m == NULL || out_of_map (m, x, y)) 2000 if (m == NULL || out_of_map (m, x, y))
… …
2075 * a matching type variable at the given map and coordinates. 2013 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 2014 * The first matching object is returned, or NULL if none.
2077 */ 2015 */
2078 2016
2079object * 2017object *
2080present (unsigned char type, mapstruct *m, int x, int y) 2018present (unsigned char type, maptile *m, int x, int y)
2081{ 2019{
2082 object * 2020 object *
2083 tmp; 2021 tmp;
2084 2022
2085 if (out_of_map (m, x, y)) 2023 if (out_of_map (m, x, y))
… …
2225 * the archetype because that isn't correct if the monster has been 2163 * the archetype because that isn't correct if the monster has been
2226 * customized, changed states, etc. 2164 * customized, changed states, etc.
2227 */ 2165 */
2228 2166
2229int 2167int
2230find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2168find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2231{ 2169{
2232 int 2170 int
2233 i, 2171 i,
2234 index = 0, flag; 2172 index = 0, flag;
2235 static int 2173 static int
… …
2256 return -1; 2194 return -1;
2257 return altern[RANDOM () % index]; 2195 return altern[RANDOM () % index];
2258} 2196}
2259 2197
2260/* 2198/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2199 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2200 * find_free_spot(), but it will search max number of squares.
2263 * But it will return the first available spot, not a random choice. 2201 * 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. 2202 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2265 */ 2203 */
2266 2204
2267int 2205int
2268find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2206find_first_free_spot (const object *ob, maptile *m, int x, int y)
2269{ 2207{
2270 int 2208 int
2271 i; 2209 i;
2272 2210
2273 for (i = 0; i < SIZEOFFREE; i++) 2211 for (i = 0; i < SIZEOFFREE; i++)
… …
2337 * because we have to know what movement the thing looking to move 2275 * because we have to know what movement the thing looking to move
2338 * there is capable of. 2276 * there is capable of.
2339 */ 2277 */
2340 2278
2341int 2279int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2280find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2281{
2344 int 2282 int
2345 i, 2283 i,
2346 max = SIZEOFFREE, mflags; 2284 max = SIZEOFFREE, mflags;
2347 2285
2348 sint16 nx, ny; 2286 sint16 nx, ny;
2349 object * 2287 object *
2350 tmp; 2288 tmp;
2351 mapstruct * 2289 maptile *
2352 mp; 2290 mp;
2353 2291
2354 MoveType blocked, move_type; 2292 MoveType blocked, move_type;
2355 2293
2356 if (exclude && exclude->head) 2294 if (exclude && exclude->head)
… …
2564 * Modified to be map tile aware -.MSW 2502 * Modified to be map tile aware -.MSW
2565 */ 2503 */
2566 2504
2567 2505
2568int 2506int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2507can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2508{
2571 sint16 dx, dy; 2509 sint16 dx, dy;
2572 int 2510 int
2573 mflags; 2511 mflags;
2574 2512
… …
2654 if (prev) 2592 if (prev)
2655 prev->more = tmp; 2593 prev->more = tmp;
2656 prev = tmp; 2594 prev = tmp;
2657 } 2595 }
2658 2596
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2597 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2598 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2599
2665 return dst; 2600 return dst;
2666} 2601}
2667 2602
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. */ 2603/* 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 */ 2604/* 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, */ 2605/* 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. */ 2606/* 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. */ 2607/* Remember not to use load_object_str in a time-critical situation. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2608/* Also remember that multiparts objects are not supported for now. */
2688 2609
2689object * 2610object *
2690load_object_str (const char *obstr) 2611load_object_str (const char *obstr)
2691{ 2612{
2692 object * 2613 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2614 char filename[MAX_BUF];
2696 2615
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2616 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2617
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2618 FILE *tempfile = fopen (filename, "w");
2701 2619
2702 if (tempfile == NULL) 2620 if (tempfile == NULL)
2703 { 2621 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2622 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2623 return NULL;
… …
2726 * returns NULL if no match. 2644 * returns NULL if no match.
2727 */ 2645 */
2728object * 2646object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2647find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2648{
2731 object * 2649 object *tmp;
2732 tmp;
2733 2650
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2651 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2652 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2653 return tmp;
2737 2654
… …
2745 * do the desired thing. 2662 * do the desired thing.
2746 */ 2663 */
2747key_value * 2664key_value *
2748get_ob_key_link (const object *ob, const char *key) 2665get_ob_key_link (const object *ob, const char *key)
2749{ 2666{
2750 key_value * 2667 key_value *link;
2751 link;
2752 2668
2753 for (link = ob->key_values; link != NULL; link = link->next) 2669 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2670 if (link->key == key)
2756 {
2757 return link; 2671 return link;
2758 }
2759 }
2760 2672
2761 return NULL; 2673 return NULL;
2762} 2674}
2763 2675
2764/* 2676/*

Diff Legend

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