ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.54 by root, Fri Nov 17 19:40:53 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 43};
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 375 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 376 * The result of the dump is stored in the static global errmsg array.
379 */ 377 */
380 378
381void 379char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 380dump_object (object *op)
437{ 381{
438 if (op == NULL) 382 if (!op)
439 { 383 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 384
447void 385 object_freezer freezer;
448dump_all_objects (void) 386 save_object (freezer, op, 3);
449{ 387 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 388}
458 389
459/* 390/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 391 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
481 */ 412 */
482 413
483object * 414object *
484find_object (tag_t i) 415find_object (tag_t i)
485{ 416{
486 object *op; 417 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 418 if (op->count == i)
490 break; 419 return op;
420
491 return op; 421 return 0;
492} 422}
493 423
494/* 424/*
495 * Returns the first object which has a name equal to the argument. 425 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 431find_object_name (const char *str)
502{ 432{
503 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
504 object *op; 434 object *op;
505 435
506 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 437 if (op->name == str_)
508 break; 438 break;
509 439
510 return op; 440 return op;
511} 441}
512 442
513void 443void
514free_all_object_data () 444free_all_object_data ()
515{ 445{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 447}
539 448
540/* 449/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 450 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 451 * skill and experience objects.
… …
612 521
613 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
614 523
615 expmul = 1.0; 524 expmul = 1.0;
616 face = blank_face; 525 face = blank_face;
617 attacked_by_count = -1;
618 526
619 if (settings.casting_time) 527 if (settings.casting_time)
620 casting_time = -1; 528 casting_time = -1;
621} 529}
622 530
… …
917 825
918 if (op->more != NULL) 826 if (op->more != NULL)
919 update_object (op->more, action); 827 update_object (op->more, action);
920} 828}
921 829
922static unordered_vector<object *> mortals; 830object::vector object::mortals;
831object::vector object::objects; // not yet used
832object *object::first;
923 833
924void object::free_mortals () 834void object::free_mortals ()
925{ 835{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 837 if ((*i)->refcnt)
928 ++i; // further delay freeing 838 ++i; // further delay freeing
929 else 839 else
930 { 840 {
931 delete *i; 841 delete *i;
932 mortals.erase (i); 842 mortals.erase (i);
933 } 843 }
934 844
935 static int lastmortals = 0;//D 845 static int lastmortals = 0;//D
936 846
937 if (mortals.size() != lastmortals)//D 847 if (mortals.size() != lastmortals && lastmortals > 100)//D
938 { 848 {
939 lastmortals = mortals.size ();//D 849 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 } 851 }
942} 852}
… …
945{ 855{
946 SET_FLAG (this, FLAG_REMOVED); 856 SET_FLAG (this, FLAG_REMOVED);
947 857
948 expmul = 1.0; 858 expmul = 1.0;
949 face = blank_face; 859 face = blank_face;
950 attacked_by_count = -1;
951} 860}
952 861
953object::~object () 862object::~object ()
954{ 863{
955 free_key_values (this); 864 free_key_values (this);
… …
959{ 868{
960 count = ++ob_count; 869 count = ++ob_count;
961 uuid = gen_uuid (); 870 uuid = gen_uuid ();
962 871
963 prev = 0; 872 prev = 0;
964 next = objects; 873 next = object::first;
965 874
966 if (objects) 875 if (object::first)
967 objects->prev = this; 876 object::first->prev = this;
968 877
969 objects = this; 878 object::first = this;
970} 879}
971 880
972void object::unlink () 881void object::unlink ()
973{ 882{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 883 if (this == object::first)
978 objects = next; 884 object::first = next;
979 885
980 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 887 if (prev) prev->next = next;
982 if (next) next->prev = prev; 888 if (next) next->prev = prev;
983 889
… …
997 * 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
998 * free objects. The IS_FREED() flag is set in the object. 904 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 906 * this function to succeed.
1001 * 907 *
1002 * 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
1003 * inventory to the ground. 909 * inventory to the ground.
1004 */ 910 */
1005void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
1006{ 912{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 914 return;
1009 915
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
1015 921
1016 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
1017 923
1018 if (more) 924 if (more)
1019 { 925 {
1020 more->free (free_inventory); 926 more->destroy (destroy_inventory);
1021 more = 0; 927 more = 0;
1022 } 928 }
1023 929
1024 if (inv) 930 if (inv)
1025 { 931 {
1026 /* Only if the space blocks everything do we not process - 932 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 933 * if some form of movement is allowed, let objects
1028 * drop on that space. 934 * drop on that space.
1029 */ 935 */
1030 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)
1031 { 937 {
1032 object *op = inv; 938 object *op = inv;
1033 939
1034 while (op) 940 while (op)
1035 { 941 {
1036 object *tmp = op->below; 942 object *tmp = op->below;
1037 op->free (free_inventory); 943 op->destroy (destroy_inventory);
1038 op = tmp; 944 op = tmp;
1039 } 945 }
1040 } 946 }
1041 else 947 else
1042 { /* Put objects in inventory onto this space */ 948 { /* Put objects in inventory onto this space */
… …
1061 op = tmp; 967 op = tmp;
1062 } 968 }
1063 } 969 }
1064 } 970 }
1065 971
972 // clear those pointers that likely might have circular references to us
1066 owner = 0; 973 owner = 0;
974 enemy = 0;
975 attacked_by = 0;
976
977 // only relevant for players(?), but make sure of it anyways
978 contr = 0;
1067 979
1068 /* Remove object from the active list */ 980 /* Remove object from the active list */
1069 speed = 0; 981 speed = 0;
1070 update_ob_speed (this); 982 update_ob_speed (this);
1071 983
… …
1083sub_weight (object *op, signed long weight) 995sub_weight (object *op, signed long weight)
1084{ 996{
1085 while (op != NULL) 997 while (op != NULL)
1086 { 998 {
1087 if (op->type == CONTAINER) 999 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1000 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1001
1091 op->carrying -= weight; 1002 op->carrying -= weight;
1092 op = op->env; 1003 op = op->env;
1093 } 1004 }
1094} 1005}
1095 1006
… …
1103 */ 1014 */
1104 1015
1105void 1016void
1106remove_ob (object *op) 1017remove_ob (object *op)
1107{ 1018{
1019 object *tmp, *last = 0;
1108 object * 1020 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1021
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1022 int check_walk_off;
1118 mapstruct * 1023 maptile *m;
1119 m;
1120 1024
1121 sint16 1025 sint16 x, y;
1122 x,
1123 y;
1124 1026
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1027 if (QUERY_FLAG (op, FLAG_REMOVED))
1126 return; 1028 return;
1127 1029
1128 SET_FLAG (op, FLAG_REMOVED); 1030 SET_FLAG (op, FLAG_REMOVED);
… …
1205 * use translated coordinates in case some oddness with map tiling is 1107 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1108 * evident
1207 */ 1109 */
1208 if (GET_MAP_OB (m, x, y) != op) 1110 if (GET_MAP_OB (m, x, y) != op)
1209 { 1111 {
1210 dump_object (op); 1112 char *dump = dump_object (op);
1211 LOG (llevError, 1113 LOG (llevError,
1212 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1114 "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);
1115 free (dump);
1213 dump_object (GET_MAP_OB (m, x, y)); 1116 dump = dump_object (GET_MAP_OB (m, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1117 LOG (llevError, "%s\n", dump);
1118 free (dump);
1215 } 1119 }
1216 1120
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1218 } 1122 }
1219 1123
… …
1221 op->below = 0; 1125 op->below = 0;
1222 1126
1223 if (op->map->in_memory == MAP_SAVING) 1127 if (op->map->in_memory == MAP_SAVING)
1224 return; 1128 return;
1225 1129
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1228 1131
1229 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1230 { 1133 {
1231 /* No point updating the players look faces if he is the object 1134 /* No point updating the players look faces if he is the object
… …
1246 1149
1247 tmp->contr->socket.update_look = 1; 1150 tmp->contr->socket.update_look = 1;
1248 } 1151 }
1249 1152
1250 /* See if player moving off should effect something */ 1153 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1154 if (check_walk_off
1155 && ((op->move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1157 {
1253 move_apply (tmp, op, NULL); 1158 move_apply (tmp, op, NULL);
1254 1159
1255 if (was_destroyed (op, tag)) 1160 if (op->destroyed ())
1256 {
1257 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1258 }
1259 } 1162 }
1260 1163
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1165
1263 if (tmp->above == tmp) 1166 if (tmp->above == tmp)
… …
1316 free_object (op); 1219 free_object (op);
1317 return top; 1220 return top;
1318 } 1221 }
1319 } 1222 }
1320 1223
1321 return NULL; 1224 return 0;
1322} 1225}
1323 1226
1324/* 1227/*
1325 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1228 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1326 * job preparing multi-part monsters 1229 * job preparing multi-part monsters
1327 */ 1230 */
1328object * 1231object *
1329insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1330{ 1233{
1331 object *tmp; 1234 object *tmp;
1332 1235
1333 if (op->head) 1236 if (op->head)
1334 op = op->head; 1237 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1265 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1266 * just 'op' otherwise
1364 */ 1267 */
1365 1268
1366object * 1269object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1271{
1369 object *tmp, *top, *floor = NULL; 1272 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1273 sint16 x, y;
1371 1274
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1275 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1278 return NULL;
1376 } 1279 }
1377 1280
1378 if (m == NULL) 1281 if (m == NULL)
1379 { 1282 {
1380 dump_object (op); 1283 char *dump = dump_object (op);
1381 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1284 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1285 free (dump);
1382 return op; 1286 return op;
1383 } 1287 }
1384 1288
1385 if (out_of_map (m, op->x, op->y)) 1289 if (out_of_map (m, op->x, op->y))
1386 { 1290 {
1387 dump_object (op); 1291 char *dump = dump_object (op);
1388 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1292 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1389#ifdef MANY_CORES 1293#ifdef MANY_CORES
1390 /* Better to catch this here, as otherwise the next use of this object 1294 /* Better to catch this here, as otherwise the next use of this object
1391 * is likely to cause a crash. Better to find out where it is getting 1295 * is likely to cause a crash. Better to find out where it is getting
1392 * improperly inserted. 1296 * improperly inserted.
1393 */ 1297 */
1394 abort (); 1298 abort ();
1395#endif 1299#endif
1300 free (dump);
1396 return op; 1301 return op;
1397 } 1302 }
1398 1303
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1304 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1305 {
1401 dump_object (op); 1306 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1307 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1308 free (dump);
1403 return op; 1309 return op;
1404 } 1310 }
1405 1311
1406 if (op->more != NULL) 1312 if (op->more != NULL)
1407 { 1313 {
… …
1653 remove_ob (tmp); 1559 remove_ob (tmp);
1654 free_object (tmp); 1560 free_object (tmp);
1655 } 1561 }
1656 } 1562 }
1657 1563
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1564 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1565
1660 tmp1->x = op->x; 1566 tmp1->x = op->x;
1661 tmp1->y = op->y; 1567 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1568 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1569}
… …
1844 tmp, * 1750 tmp, *
1845 otmp; 1751 otmp;
1846 1752
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1754 {
1849 dump_object (op); 1755 char *dump = dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1851 return op; 1758 return op;
1852 } 1759 }
1853 1760
1854 if (where == NULL) 1761 if (where == NULL)
1855 { 1762 {
1856 dump_object (op); 1763 char *dump = dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump);
1858 return op; 1766 return op;
1859 } 1767 }
1860 1768
1861 if (where->head) 1769 if (where->head)
1862 { 1770 {
… …
1962 */ 1870 */
1963 1871
1964int 1872int
1965check_move_on (object *op, object *originator) 1873check_move_on (object *op, object *originator)
1966{ 1874{
1967 object * 1875 object *tmp;
1968 tmp; 1876 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1877 int x = op->x, y = op->y;
1975 1878
1976 MoveType 1879 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1880
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1881 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1882 return 0;
1983
1984 tag = op->count;
1985 1883
1986 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1884 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1987 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1885 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1988 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1886 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1989 1887
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1948 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1949 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1950 {
2053 move_apply (tmp, op, originator); 1951 move_apply (tmp, op, originator);
2054 1952
2055 if (was_destroyed (op, tag)) 1953 if (op->destroyed ())
2056 return 1; 1954 return 1;
2057 1955
2058 /* what the person/creature stepped onto has moved the object 1956 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1957 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1958 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1970 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1971 * The first matching object is returned, or NULL if none.
2074 */ 1972 */
2075 1973
2076object * 1974object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1975present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1976{
2079 object * 1977 object *
2080 tmp; 1978 tmp;
2081 1979
2082 if (m == NULL || out_of_map (m, x, y)) 1980 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1993 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1994 * The first matching object is returned, or NULL if none.
2097 */ 1995 */
2098 1996
2099object * 1997object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1998present (unsigned char type, maptile *m, int x, int y)
2101{ 1999{
2102 object * 2000 object *
2103 tmp; 2001 tmp;
2104 2002
2105 if (out_of_map (m, x, y)) 2003 if (out_of_map (m, x, y))
… …
2245 * the archetype because that isn't correct if the monster has been 2143 * the archetype because that isn't correct if the monster has been
2246 * customized, changed states, etc. 2144 * customized, changed states, etc.
2247 */ 2145 */
2248 2146
2249int 2147int
2250find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2148find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2251{ 2149{
2252 int 2150 int
2253 i, 2151 i,
2254 index = 0, flag; 2152 index = 0, flag;
2255 static int 2153 static int
… …
2276 return -1; 2174 return -1;
2277 return altern[RANDOM () % index]; 2175 return altern[RANDOM () % index];
2278} 2176}
2279 2177
2280/* 2178/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2179 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2180 * find_free_spot(), but it will search max number of squares.
2283 * But it will return the first available spot, not a random choice. 2181 * But it will return the first available spot, not a random choice.
2284 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2182 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2285 */ 2183 */
2286 2184
2287int 2185int
2288find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2186find_first_free_spot (const object *ob, maptile *m, int x, int y)
2289{ 2187{
2290 int 2188 int
2291 i; 2189 i;
2292 2190
2293 for (i = 0; i < SIZEOFFREE; i++) 2191 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * because we have to know what movement the thing looking to move 2255 * because we have to know what movement the thing looking to move
2358 * there is capable of. 2256 * there is capable of.
2359 */ 2257 */
2360 2258
2361int 2259int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2260find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2261{
2364 int 2262 int
2365 i, 2263 i,
2366 max = SIZEOFFREE, mflags; 2264 max = SIZEOFFREE, mflags;
2367 2265
2368 sint16 nx, ny; 2266 sint16 nx, ny;
2369 object * 2267 object *
2370 tmp; 2268 tmp;
2371 mapstruct * 2269 maptile *
2372 mp; 2270 mp;
2373 2271
2374 MoveType blocked, move_type; 2272 MoveType blocked, move_type;
2375 2273
2376 if (exclude && exclude->head) 2274 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2482 * Modified to be map tile aware -.MSW
2585 */ 2483 */
2586 2484
2587 2485
2588int 2486int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2487can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2488{
2591 sint16 dx, dy; 2489 sint16 dx, dy;
2592 int 2490 int
2593 mflags; 2491 mflags;
2594 2492
… …
2674 if (prev) 2572 if (prev)
2675 prev->more = tmp; 2573 prev->more = tmp;
2676 prev = tmp; 2574 prev = tmp;
2677 } 2575 }
2678 2576
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2577 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2578 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2579
2685 return dst; 2580 return dst;
2686} 2581}
2687 2582
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2583/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2584/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2585/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2586/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2587/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2588/* Also remember that multiparts objects are not supported for now. */
2708 2589
2709object * 2590object *
2710load_object_str (const char *obstr) 2591load_object_str (const char *obstr)
2711{ 2592{
2712 object * 2593 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2594 char filename[MAX_BUF];
2716 2595
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2596 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2597
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2598 FILE *tempfile = fopen (filename, "w");
2721 2599
2722 if (tempfile == NULL) 2600 if (tempfile == NULL)
2723 { 2601 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2602 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2603 return NULL;
… …
2746 * returns NULL if no match. 2624 * returns NULL if no match.
2747 */ 2625 */
2748object * 2626object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2627find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2628{
2751 object * 2629 object *tmp;
2752 tmp;
2753 2630
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2631 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2632 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2633 return tmp;
2757 2634
… …
2765 * do the desired thing. 2642 * do the desired thing.
2766 */ 2643 */
2767key_value * 2644key_value *
2768get_ob_key_link (const object *ob, const char *key) 2645get_ob_key_link (const object *ob, const char *key)
2769{ 2646{
2770 key_value * 2647 key_value *link;
2771 link;
2772 2648
2773 for (link = ob->key_values; link != NULL; link = link->next) 2649 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2650 if (link->key == key)
2776 {
2777 return link; 2651 return link;
2778 }
2779 }
2780 2652
2781 return NULL; 2653 return NULL;
2782} 2654}
2783 2655
2784/* 2656/*

Diff Legend

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