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.53 by root, Tue Nov 7 16:30:54 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.
… …
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 object *op;
487 418
488 for (op = objects; op != NULL; op = op->next) 419 for (op = object::first; op != NULL; op = op->next)
489 if (op->count == i) 420 if (op->count == i)
490 break; 421 break;
422
491 return op; 423 return op;
492} 424}
493 425
494/* 426/*
495 * Returns the first object which has a name equal to the argument. 427 * Returns the first object which has a name equal to the argument.
… …
501find_object_name (const char *str) 433find_object_name (const char *str)
502{ 434{
503 shstr_cmp str_ (str); 435 shstr_cmp str_ (str);
504 object *op; 436 object *op;
505 437
506 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 439 if (op->name == str_)
508 break; 440 break;
509 441
510 return op; 442 return op;
511} 443}
… …
895 827
896 if (op->more != NULL) 828 if (op->more != NULL)
897 update_object (op->more, action); 829 update_object (op->more, action);
898} 830}
899 831
900static unordered_vector<object *> mortals; 832object::vector object::mortals;
833object::vector object::objects; // not yet used
834object *object::first;
901 835
902void object::free_mortals () 836void object::free_mortals ()
903{ 837{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 839 if ((*i)->refcnt)
906 ++i; // further delay freeing 840 ++i; // further delay freeing
907 else 841 else
908 { 842 {
909 delete *i; 843 delete *i;
910 mortals.erase (i); 844 mortals.erase (i);
911 } 845 }
912 846
913 static int lastmortals = 0;//D 847 static int lastmortals = 0;//D
914 848
915 if (mortals.size() != lastmortals)//D 849 if (mortals.size() != lastmortals && lastmortals > 100)//D
916 { 850 {
917 lastmortals = mortals.size ();//D 851 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D 852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 } 853 }
920} 854}
… …
936{ 870{
937 count = ++ob_count; 871 count = ++ob_count;
938 uuid = gen_uuid (); 872 uuid = gen_uuid ();
939 873
940 prev = 0; 874 prev = 0;
941 next = objects; 875 next = object::first;
942 876
943 if (objects) 877 if (object::first)
944 objects->prev = this; 878 object::first->prev = this;
945 879
946 objects = this; 880 object::first = this;
947} 881}
948 882
949void object::unlink () 883void object::unlink ()
950{ 884{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 885 if (this == object::first)
955 objects = next; 886 object::first = next;
956 887
957 /* Remove this object from the list of used objects */ 888 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 889 if (prev) prev->next = next;
959 if (next) next->prev = prev; 890 if (next) next->prev = prev;
960 891
… …
974 * it from the list of used objects, and puts it on the list of 905 * 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. 906 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 907 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 908 * this function to succeed.
978 * 909 *
979 * If free_inventory is set, free inventory as well. Else drop items in 910 * If destroy_inventory is set, free inventory as well. Else drop items in
980 * inventory to the ground. 911 * inventory to the ground.
981 */ 912 */
982void object::free (bool free_inventory) 913void object::destroy (bool destroy_inventory)
983{ 914{
984 if (QUERY_FLAG (this, FLAG_FREED)) 915 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 916 return;
986 917
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 918 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
992 923
993 SET_FLAG (this, FLAG_FREED); 924 SET_FLAG (this, FLAG_FREED);
994 925
995 if (more) 926 if (more)
996 { 927 {
997 more->free (free_inventory); 928 more->destroy (destroy_inventory);
998 more = 0; 929 more = 0;
999 } 930 }
1000 931
1001 if (inv) 932 if (inv)
1002 { 933 {
1003 /* Only if the space blocks everything do we not process - 934 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 935 * if some form of movement is allowed, let objects
1005 * drop on that space. 936 * drop on that space.
1006 */ 937 */
1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 938 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008 { 939 {
1009 object *op = inv; 940 object *op = inv;
1010 941
1011 while (op) 942 while (op)
1012 { 943 {
1013 object *tmp = op->below; 944 object *tmp = op->below;
1014 op->free (free_inventory); 945 op->destroy (destroy_inventory);
1015 op = tmp; 946 op = tmp;
1016 } 947 }
1017 } 948 }
1018 else 949 else
1019 { /* Put objects in inventory onto this space */ 950 { /* Put objects in inventory onto this space */
… …
1038 op = tmp; 969 op = tmp;
1039 } 970 }
1040 } 971 }
1041 } 972 }
1042 973
974 // clear those pointers that likely might have circular references to us
1043 owner = 0; 975 owner = 0;
976 enemy = 0;
977 attacked_by = 0;
978
979 // only relevant for players(?), but make sure of it anyways
980 contr = 0;
1044 981
1045 /* Remove object from the active list */ 982 /* Remove object from the active list */
1046 speed = 0; 983 speed = 0;
1047 update_ob_speed (this); 984 update_ob_speed (this);
1048 985
… …
1060sub_weight (object *op, signed long weight) 997sub_weight (object *op, signed long weight)
1061{ 998{
1062 while (op != NULL) 999 while (op != NULL)
1063 { 1000 {
1064 if (op->type == CONTAINER) 1001 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1002 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 } 1003
1068 op->carrying -= weight; 1004 op->carrying -= weight;
1069 op = op->env; 1005 op = op->env;
1070 } 1006 }
1071} 1007}
1072 1008
… …
1080 */ 1016 */
1081 1017
1082void 1018void
1083remove_ob (object *op) 1019remove_ob (object *op)
1084{ 1020{
1021 object *tmp, *last = 0;
1085 object * 1022 object *otmp;
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090 1023
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off; 1024 int check_walk_off;
1095 mapstruct * 1025 maptile *m;
1096 m;
1097 1026
1098 sint16 1027 sint16 x, y;
1099 x,
1100 y;
1101 1028
1102 if (QUERY_FLAG (op, FLAG_REMOVED)) 1029 if (QUERY_FLAG (op, FLAG_REMOVED))
1103 return; 1030 return;
1104 1031
1105 SET_FLAG (op, FLAG_REMOVED); 1032 SET_FLAG (op, FLAG_REMOVED);
… …
1182 * use translated coordinates in case some oddness with map tiling is 1109 * use translated coordinates in case some oddness with map tiling is
1183 * evident 1110 * evident
1184 */ 1111 */
1185 if (GET_MAP_OB (m, x, y) != op) 1112 if (GET_MAP_OB (m, x, y) != op)
1186 { 1113 {
1187 dump_object (op); 1114 char *dump = dump_object (op);
1188 LOG (llevError, 1115 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); 1116 "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);
1117 free (dump);
1190 dump_object (GET_MAP_OB (m, x, y)); 1118 dump = dump_object (GET_MAP_OB (m, x, y));
1191 LOG (llevError, "%s\n", errmsg); 1119 LOG (llevError, "%s\n", dump);
1120 free (dump);
1192 } 1121 }
1193 1122
1194 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1123 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1195 } 1124 }
1196 1125
… …
1198 op->below = 0; 1127 op->below = 0;
1199 1128
1200 if (op->map->in_memory == MAP_SAVING) 1129 if (op->map->in_memory == MAP_SAVING)
1201 return; 1130 return;
1202 1131
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1205 1133
1206 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1134 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1207 { 1135 {
1208 /* No point updating the players look faces if he is the object 1136 /* No point updating the players look faces if he is the object
… …
1223 1151
1224 tmp->contr->socket.update_look = 1; 1152 tmp->contr->socket.update_look = 1;
1225 } 1153 }
1226 1154
1227 /* See if player moving off should effect something */ 1155 /* 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)) 1156 if (check_walk_off
1157 && ((op->move_type & tmp->move_off)
1158 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229 { 1159 {
1230 move_apply (tmp, op, NULL); 1160 move_apply (tmp, op, NULL);
1231 1161
1232 if (was_destroyed (op, tag)) 1162 if (op->destroyed ())
1233 {
1234 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1235 }
1236 } 1164 }
1237 1165
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1167
1240 if (tmp->above == tmp) 1168 if (tmp->above == tmp)
… …
1293 free_object (op); 1221 free_object (op);
1294 return top; 1222 return top;
1295 } 1223 }
1296 } 1224 }
1297 1225
1298 return NULL; 1226 return 0;
1299} 1227}
1300 1228
1301/* 1229/*
1302 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1230 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1303 * job preparing multi-part monsters 1231 * job preparing multi-part monsters
1304 */ 1232 */
1305object * 1233object *
1306insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1234insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1307{ 1235{
1308 object *tmp; 1236 object *tmp;
1309 1237
1310 if (op->head) 1238 if (op->head)
1311 op = op->head; 1239 op = op->head;
… …
1339 * NULL if 'op' was destroyed 1267 * NULL if 'op' was destroyed
1340 * just 'op' otherwise 1268 * just 'op' otherwise
1341 */ 1269 */
1342 1270
1343object * 1271object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1273{
1346 object *tmp, *top, *floor = NULL; 1274 object *tmp, *top, *floor = NULL;
1347 sint16 x, y; 1275 sint16 x, y;
1348 1276
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1277 if (QUERY_FLAG (op, FLAG_FREED))
… …
1352 return NULL; 1280 return NULL;
1353 } 1281 }
1354 1282
1355 if (m == NULL) 1283 if (m == NULL)
1356 { 1284 {
1357 dump_object (op); 1285 char *dump = dump_object (op);
1358 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1286 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1287 free (dump);
1359 return op; 1288 return op;
1360 } 1289 }
1361 1290
1362 if (out_of_map (m, op->x, op->y)) 1291 if (out_of_map (m, op->x, op->y))
1363 { 1292 {
1364 dump_object (op); 1293 char *dump = dump_object (op);
1365 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1294 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1366#ifdef MANY_CORES 1295#ifdef MANY_CORES
1367 /* Better to catch this here, as otherwise the next use of this object 1296 /* 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 1297 * is likely to cause a crash. Better to find out where it is getting
1369 * improperly inserted. 1298 * improperly inserted.
1370 */ 1299 */
1371 abort (); 1300 abort ();
1372#endif 1301#endif
1302 free (dump);
1373 return op; 1303 return op;
1374 } 1304 }
1375 1305
1376 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1306 if (!QUERY_FLAG (op, FLAG_REMOVED))
1377 { 1307 {
1378 dump_object (op); 1308 char *dump = dump_object (op);
1379 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1309 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1310 free (dump);
1380 return op; 1311 return op;
1381 } 1312 }
1382 1313
1383 if (op->more != NULL) 1314 if (op->more != NULL)
1384 { 1315 {
… …
1630 remove_ob (tmp); 1561 remove_ob (tmp);
1631 free_object (tmp); 1562 free_object (tmp);
1632 } 1563 }
1633 } 1564 }
1634 1565
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1566 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1567
1637 tmp1->x = op->x; 1568 tmp1->x = op->x;
1638 tmp1->y = op->y; 1569 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1570 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1571}
… …
1821 tmp, * 1752 tmp, *
1822 otmp; 1753 otmp;
1823 1754
1824 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1825 { 1756 {
1826 dump_object (op); 1757 char *dump = dump_object (op);
1827 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1758 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759 free (dump);
1828 return op; 1760 return op;
1829 } 1761 }
1830 1762
1831 if (where == NULL) 1763 if (where == NULL)
1832 { 1764 {
1833 dump_object (op); 1765 char *dump = dump_object (op);
1834 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1766 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767 free (dump);
1835 return op; 1768 return op;
1836 } 1769 }
1837 1770
1838 if (where->head) 1771 if (where->head)
1839 { 1772 {
… …
1939 */ 1872 */
1940 1873
1941int 1874int
1942check_move_on (object *op, object *originator) 1875check_move_on (object *op, object *originator)
1943{ 1876{
1944 object * 1877 object *tmp;
1945 tmp; 1878 maptile *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1879 int x = op->x, y = op->y;
1952 1880
1953 MoveType 1881 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1882
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1883 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1884 return 0;
1960
1961 tag = op->count;
1962 1885
1963 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1886 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); 1887 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); 1888 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1966 1889
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1950 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)) 1951 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029 { 1952 {
2030 move_apply (tmp, op, originator); 1953 move_apply (tmp, op, originator);
2031 1954
2032 if (was_destroyed (op, tag)) 1955 if (op->destroyed ())
2033 return 1; 1956 return 1;
2034 1957
2035 /* what the person/creature stepped onto has moved the object 1958 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 1959 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 1960 * have a feeling strange problems would result.
… …
2049 * a matching archetype at the given map and coordinates. 1972 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2051 */ 1974 */
2052 1975
2053object * 1976object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 1977present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 1978{
2056 object * 1979 object *
2057 tmp; 1980 tmp;
2058 1981
2059 if (m == NULL || out_of_map (m, x, y)) 1982 if (m == NULL || out_of_map (m, x, y))
… …
2072 * a matching type variable at the given map and coordinates. 1995 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1996 * The first matching object is returned, or NULL if none.
2074 */ 1997 */
2075 1998
2076object * 1999object *
2077present (unsigned char type, mapstruct *m, int x, int y) 2000present (unsigned char type, maptile *m, int x, int y)
2078{ 2001{
2079 object * 2002 object *
2080 tmp; 2003 tmp;
2081 2004
2082 if (out_of_map (m, x, y)) 2005 if (out_of_map (m, x, y))
… …
2222 * the archetype because that isn't correct if the monster has been 2145 * the archetype because that isn't correct if the monster has been
2223 * customized, changed states, etc. 2146 * customized, changed states, etc.
2224 */ 2147 */
2225 2148
2226int 2149int
2227find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2150find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2228{ 2151{
2229 int 2152 int
2230 i, 2153 i,
2231 index = 0, flag; 2154 index = 0, flag;
2232 static int 2155 static int
… …
2253 return -1; 2176 return -1;
2254 return altern[RANDOM () % index]; 2177 return altern[RANDOM () % index];
2255} 2178}
2256 2179
2257/* 2180/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2181 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2182 * find_free_spot(), but it will search max number of squares.
2260 * But it will return the first available spot, not a random choice. 2183 * 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. 2184 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2262 */ 2185 */
2263 2186
2264int 2187int
2265find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2188find_first_free_spot (const object *ob, maptile *m, int x, int y)
2266{ 2189{
2267 int 2190 int
2268 i; 2191 i;
2269 2192
2270 for (i = 0; i < SIZEOFFREE; i++) 2193 for (i = 0; i < SIZEOFFREE; i++)
… …
2334 * because we have to know what movement the thing looking to move 2257 * because we have to know what movement the thing looking to move
2335 * there is capable of. 2258 * there is capable of.
2336 */ 2259 */
2337 2260
2338int 2261int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2262find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2263{
2341 int 2264 int
2342 i, 2265 i,
2343 max = SIZEOFFREE, mflags; 2266 max = SIZEOFFREE, mflags;
2344 2267
2345 sint16 nx, ny; 2268 sint16 nx, ny;
2346 object * 2269 object *
2347 tmp; 2270 tmp;
2348 mapstruct * 2271 maptile *
2349 mp; 2272 mp;
2350 2273
2351 MoveType blocked, move_type; 2274 MoveType blocked, move_type;
2352 2275
2353 if (exclude && exclude->head) 2276 if (exclude && exclude->head)
… …
2561 * Modified to be map tile aware -.MSW 2484 * Modified to be map tile aware -.MSW
2562 */ 2485 */
2563 2486
2564 2487
2565int 2488int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2489can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2490{
2568 sint16 dx, dy; 2491 sint16 dx, dy;
2569 int 2492 int
2570 mflags; 2493 mflags;
2571 2494
… …
2651 if (prev) 2574 if (prev)
2652 prev->more = tmp; 2575 prev->more = tmp;
2653 prev = tmp; 2576 prev = tmp;
2654 } 2577 }
2655 2578
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2579 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2580 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2581
2662 return dst; 2582 return dst;
2663} 2583}
2664 2584
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. */ 2585/* 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 */ 2586/* 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, */ 2587/* 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. */ 2588/* 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. */ 2589/* Remember not to use load_object_str in a time-critical situation. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2590/* Also remember that multiparts objects are not supported for now. */
2685 2591
2686object * 2592object *
2687load_object_str (const char *obstr) 2593load_object_str (const char *obstr)
2688{ 2594{
2689 object * 2595 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2596 char filename[MAX_BUF];
2693 2597
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2598 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2599
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2600 FILE *tempfile = fopen (filename, "w");
2698 2601
2699 if (tempfile == NULL) 2602 if (tempfile == NULL)
2700 { 2603 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2604 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2605 return NULL;
… …
2723 * returns NULL if no match. 2626 * returns NULL if no match.
2724 */ 2627 */
2725object * 2628object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2629find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2630{
2728 object * 2631 object *tmp;
2729 tmp;
2730 2632
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2633 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2634 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2635 return tmp;
2734 2636
… …
2742 * do the desired thing. 2644 * do the desired thing.
2743 */ 2645 */
2744key_value * 2646key_value *
2745get_ob_key_link (const object *ob, const char *key) 2647get_ob_key_link (const object *ob, const char *key)
2746{ 2648{
2747 key_value * 2649 key_value *link;
2748 link;
2749 2650
2750 for (link = ob->key_values; link != NULL; link = link->next) 2651 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2652 if (link->key == key)
2753 {
2754 return link; 2653 return link;
2755 }
2756 }
2757 2654
2758 return NULL; 2655 return NULL;
2759} 2656}
2760 2657
2761/* 2658/*

Diff Legend

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