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.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.51 by root, Sun Sep 17 16:21: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. */
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h>
35#include <loader.h> 33#include <loader.h>
36 34
37int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
38 38
39object *objects; /* Pointer to the list of used objects */
40object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
41 40
42short 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,
43 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
44}; 43};
50}; 49};
51int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 53};
54
55static void
56write_uuid (void)
57{
58 char filename1[MAX_BUF], filename2[MAX_BUF];
59
60 sprintf (filename1, "%s/uuid", settings.localdir);
61 sprintf (filename2, "%s/uuid~", settings.localdir);
62
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74}
75
76static void
77read_uuid (void)
78{
79 char filename[MAX_BUF];
80
81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 FILE *fp;
84
85 if (!(fp = fopen (filename, "r")))
86 {
87 if (errno == ENOENT)
88 {
89 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0;
91 write_uuid ();
92 return;
93 }
94
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1);
97 }
98
99 int version;
100 unsigned long long uid;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
102 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
104 _exit (1);
105 }
106
107 uuid.seq = uid;
108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid);
110 fclose (fp);
111}
112
113UUID
114gen_uuid ()
115{
116 UUID uid;
117
118 uid.seq = ++uuid.seq;
119
120 if (!(uuid.seq & (UUID_SKIP - 1)))
121 write_uuid ();
122
123 return uid;
124}
125
126void
127init_uuid ()
128{
129 read_uuid ();
130}
55 131
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 133static int
58compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
59{ 135{
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
366void 445void
367dump_all_objects (void) 446dump_all_objects (void)
368{ 447{
369 object *op; 448 object *op;
370 449
371 for (op = objects; op != NULL; op = op->next) 450 for (op = object::first; op != NULL; op = op->next)
372 { 451 {
373 dump_object (op); 452 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); 453 fprintf (logfile, "Object %s\n", errmsg);
375 } 454 }
376} 455}
377 456
378/* 457/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 458 * get_nearest_part(multi-object, object 2) returns the part of the
402object * 481object *
403find_object (tag_t i) 482find_object (tag_t i)
404{ 483{
405 object *op; 484 object *op;
406 485
407 for (op = objects; op != NULL; op = op->next) 486 for (op = object::first; op != NULL; op = op->next)
408 if (op->count == i) 487 if (op->count == i)
409 break; 488 break;
489
410 return op; 490 return op;
411} 491}
412 492
413/* 493/*
414 * Returns the first object which has a name equal to the argument. 494 * Returns the first object which has a name equal to the argument.
417 */ 497 */
418 498
419object * 499object *
420find_object_name (const char *str) 500find_object_name (const char *str)
421{ 501{
422 const char *name = shstr::find (str); 502 shstr_cmp str_ (str);
423 object *op; 503 object *op;
424 504
425 for (op = objects; op != NULL; op = op->next) 505 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 506 if (op->name == str_)
427 break; 507 break;
428 508
429 return op; 509 return op;
430} 510}
431 511
432void 512void
433free_all_object_data () 513free_all_object_data ()
434{ 514{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 515 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436}
437
438/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448object *
449object::get_owner ()
450{
451 if (!owner
452 || QUERY_FLAG (owner, FLAG_FREED)
453 || QUERY_FLAG (owner, FLAG_REMOVED))
454 owner = 0;
455
456 return owner;
457} 516}
458 517
459/* 518/*
460 * Sets the owner and sets the skill and exp pointers to owner's current 519 * Sets the owner and sets the skill and exp pointers to owner's current
461 * skill and experience objects. 520 * skill and experience objects.
531 590
532 /* What is not cleared is next, prev, and count */ 591 /* What is not cleared is next, prev, and count */
533 592
534 expmul = 1.0; 593 expmul = 1.0;
535 face = blank_face; 594 face = blank_face;
536 attacked_by_count = -1;
537 595
538 if (settings.casting_time) 596 if (settings.casting_time)
539 casting_time = -1; 597 casting_time = -1;
540} 598}
541 599
623/* 681/*
624 * Updates the speed of an object. If the speed changes from 0 to another 682 * Updates the speed of an object. If the speed changes from 0 to another
625 * value, or vice versa, then add/remove the object from the active list. 683 * value, or vice versa, then add/remove the object from the active list.
626 * This function needs to be called whenever the speed of an object changes. 684 * This function needs to be called whenever the speed of an object changes.
627 */ 685 */
628
629void 686void
630update_ob_speed (object *op) 687update_ob_speed (object *op)
631{ 688{
632 extern int arch_init; 689 extern int arch_init;
633 690
642 abort (); 699 abort ();
643#else 700#else
644 op->speed = 0; 701 op->speed = 0;
645#endif 702#endif
646 } 703 }
704
647 if (arch_init) 705 if (arch_init)
648 {
649 return; 706 return;
650 } 707
651 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 708 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652 { 709 {
653 /* If already on active list, don't do anything */ 710 /* If already on active list, don't do anything */
654 if (op->active_next || op->active_prev || op == active_objects) 711 if (op->active_next || op->active_prev || op == active_objects)
655 return; 712 return;
656 713
657 /* process_events() expects us to insert the object at the beginning 714 /* process_events() expects us to insert the object at the beginning
658 * of the list. */ 715 * of the list. */
659 op->active_next = active_objects; 716 op->active_next = active_objects;
717
660 if (op->active_next != NULL) 718 if (op->active_next != NULL)
661 op->active_next->active_prev = op; 719 op->active_next->active_prev = op;
720
662 active_objects = op; 721 active_objects = op;
663 } 722 }
664 else 723 else
665 { 724 {
666 /* If not on the active list, nothing needs to be done */ 725 /* If not on the active list, nothing needs to be done */
668 return; 727 return;
669 728
670 if (op->active_prev == NULL) 729 if (op->active_prev == NULL)
671 { 730 {
672 active_objects = op->active_next; 731 active_objects = op->active_next;
732
673 if (op->active_next != NULL) 733 if (op->active_next != NULL)
674 op->active_next->active_prev = NULL; 734 op->active_next->active_prev = NULL;
675 } 735 }
676 else 736 else
677 { 737 {
678 op->active_prev->active_next = op->active_next; 738 op->active_prev->active_next = op->active_next;
739
679 if (op->active_next) 740 if (op->active_next)
680 op->active_next->active_prev = op->active_prev; 741 op->active_next->active_prev = op->active_prev;
681 } 742 }
743
682 op->active_next = NULL; 744 op->active_next = NULL;
683 op->active_prev = NULL; 745 op->active_prev = NULL;
684 } 746 }
685} 747}
686 748
832 894
833 if (op->more != NULL) 895 if (op->more != NULL)
834 update_object (op->more, action); 896 update_object (op->more, action);
835} 897}
836 898
837static unordered_vector<object *> mortals; 899object::vector object::mortals;
838static std::vector<object *> freed; 900object::vector object::objects; // not yet used
901object *object::first;
839 902
840void object::free_mortals () 903void object::free_mortals ()
841{ 904{
842 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 905 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843 if ((*i)->refcnt) 906 if ((*i)->refcnt)
844 ++i; // further delay freeing 907 ++i; // further delay freeing
845 else 908 else
846 { 909 {
847 freed.push_back (*i);//D
848 //delete *i; 910 delete *i;
849 mortals.erase (i); 911 mortals.erase (i);
850 } 912 }
851 913
852 if (mortals.size())//D 914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals && lastmortals > 100)//D
917 {
918 lastmortals = mortals.size ();//D
853 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
854} 921}
855 922
856object::object () 923object::object ()
857{ 924{
858 SET_FLAG (this, FLAG_REMOVED); 925 SET_FLAG (this, FLAG_REMOVED);
859 926
860 expmul = 1.0; 927 expmul = 1.0;
861 face = blank_face; 928 face = blank_face;
862 attacked_by_count = -1;
863} 929}
864 930
865object::~object () 931object::~object ()
866{ 932{
867 free_key_values (this); 933 free_key_values (this);
868} 934}
869 935
870void object::link () 936void object::link ()
871{ 937{
872 count = ++ob_count; 938 count = ++ob_count;
939 uuid = gen_uuid ();
873 940
874 prev = 0; 941 prev = 0;
875 next = objects; 942 next = object::first;
876 943
877 if (objects) 944 if (object::first)
878 objects->prev = this; 945 object::first->prev = this;
879 946
880 objects = this; 947 object::first = this;
881} 948}
882 949
883void object::unlink () 950void object::unlink ()
884{ 951{
885 count = 0; 952 if (this == object::first)
953 object::first = next;
886 954
887 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
888 if (prev)
889 {
890 prev->next = next; 956 if (prev) prev->next = next;
957 if (next) next->prev = prev;
958
891 prev = 0; 959 prev = 0;
892 }
893
894 if (next)
895 {
896 next->prev = prev;
897 next = 0; 960 next = 0;
898 }
899
900 if (this == objects)
901 objects = next;
902} 961}
903 962
904object *object::create () 963object *object::create ()
905{ 964{
906 object *
907 op;
908
909 if (freed.empty ())
910 op = new object; 965 object *op = new object;
911 else
912 {
913 // highly annoying, but the only way to get it stable right now
914 op = freed.back ();
915 freed.pop_back ();
916 op->~object ();
917 new ((void *) op) object;
918 }
919
920 op->link (); 966 op->link ();
921 return op; 967 return op;
922} 968}
923 969
924/* 970/*
934void object::free (bool free_inventory) 980void object::free (bool free_inventory)
935{ 981{
936 if (QUERY_FLAG (this, FLAG_FREED)) 982 if (QUERY_FLAG (this, FLAG_FREED))
937 return; 983 return;
938 984
985 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this);
987
939 if (!QUERY_FLAG (this, FLAG_REMOVED)) 988 if (!QUERY_FLAG (this, FLAG_REMOVED))
940 remove_ob (this); 989 remove_ob (this);
941
942 if (QUERY_FLAG (this, FLAG_FRIENDLY))
943 remove_friendly_object (this);
944 990
945 SET_FLAG (this, FLAG_FREED); 991 SET_FLAG (this, FLAG_FREED);
946 992
947 if (more) 993 if (more)
948 { 994 {
954 { 1000 {
955 /* Only if the space blocks everything do we not process - 1001 /* Only if the space blocks everything do we not process -
956 * if some form of movement is allowed, let objects 1002 * if some form of movement is allowed, let objects
957 * drop on that space. 1003 * drop on that space.
958 */ 1004 */
959 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 1005 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
960 { 1006 {
961 object *op = inv; 1007 object *op = inv;
962 1008
963 while (op) 1009 while (op)
964 { 1010 {
990 op = tmp; 1036 op = tmp;
991 } 1037 }
992 } 1038 }
993 } 1039 }
994 1040
1041 // clear those pointers that likely might have circular references to us
995 owner = 0; 1042 owner = 0;
1043 enemy = 0;
1044 attacked_by = 0;
996 1045
997 /* Remove object from the active list */ 1046 /* Remove object from the active list */
998 speed = 0; 1047 speed = 0;
999 update_ob_speed (this); 1048 update_ob_speed (this);
1000 1049
1012sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1013{ 1062{
1014 while (op != NULL) 1063 while (op != NULL)
1015 { 1064 {
1016 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1017 {
1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019 } 1067
1020 op->carrying -= weight; 1068 op->carrying -= weight;
1021 op = op->env; 1069 op = op->env;
1022 } 1070 }
1023} 1071}
1024 1072
1032 */ 1080 */
1033 1081
1034void 1082void
1035remove_ob (object *op) 1083remove_ob (object *op)
1036{ 1084{
1085 object *tmp, *last = 0;
1037 object * 1086 object *otmp;
1038 tmp, *
1039 last = NULL;
1040 object *
1041 otmp;
1042 1087
1043 tag_t
1044 tag;
1045 int
1046 check_walk_off; 1088 int check_walk_off;
1047 mapstruct * 1089 maptile *m;
1048 m;
1049 1090
1050 sint16 1091 sint16 x, y;
1051 x,
1052 y;
1053 1092
1054 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1055 return; 1094 return;
1056 1095
1057 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
1150 op->below = 0; 1189 op->below = 0;
1151 1190
1152 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1153 return; 1192 return;
1154 1193
1155 tag = op->count;
1156 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1157 1195
1158 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1196 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1159 { 1197 {
1160 /* No point updating the players look faces if he is the object 1198 /* No point updating the players look faces if he is the object
1175 1213
1176 tmp->contr->socket.update_look = 1; 1214 tmp->contr->socket.update_look = 1;
1177 } 1215 }
1178 1216
1179 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1180 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 if (check_walk_off
1219 && ((op->move_type & tmp->move_off)
1220 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181 { 1221 {
1182 move_apply (tmp, op, NULL); 1222 move_apply (tmp, op, NULL);
1183 1223
1184 if (was_destroyed (op, tag)) 1224 if (op->destroyed ())
1185 {
1186 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1225 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187 }
1188 } 1226 }
1189 1227
1190 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1228 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191 1229
1192 if (tmp->above == tmp) 1230 if (tmp->above == tmp)
1220 * This function goes through all objects below and including top, and 1258 * This function goes through all objects below and including top, and
1221 * merges op to the first matching object. 1259 * merges op to the first matching object.
1222 * If top is NULL, it is calculated. 1260 * If top is NULL, it is calculated.
1223 * Returns pointer to object if it succeded in the merge, otherwise NULL 1261 * Returns pointer to object if it succeded in the merge, otherwise NULL
1224 */ 1262 */
1225
1226object * 1263object *
1227merge_ob (object *op, object *top) 1264merge_ob (object *op, object *top)
1228{ 1265{
1229 if (!op->nrof) 1266 if (!op->nrof)
1230 return 0; 1267 return 0;
1246 free_object (op); 1283 free_object (op);
1247 return top; 1284 return top;
1248 } 1285 }
1249 } 1286 }
1250 1287
1251 return NULL; 1288 return 0;
1252} 1289}
1253 1290
1254/* 1291/*
1255 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1292 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1256 * job preparing multi-part monsters 1293 * job preparing multi-part monsters
1257 */ 1294 */
1258object * 1295object *
1259insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1296insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260{ 1297{
1261 object *tmp; 1298 object *tmp;
1262 1299
1263 if (op->head) 1300 if (op->head)
1264 op = op->head; 1301 op = op->head;
1292 * NULL if 'op' was destroyed 1329 * NULL if 'op' was destroyed
1293 * just 'op' otherwise 1330 * just 'op' otherwise
1294 */ 1331 */
1295 1332
1296object * 1333object *
1297insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1334insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298{ 1335{
1299 object *tmp, *top, *floor = NULL; 1336 object *tmp, *top, *floor = NULL;
1300 sint16 x, y; 1337 sint16 x, y;
1301 1338
1302 if (QUERY_FLAG (op, FLAG_FREED)) 1339 if (QUERY_FLAG (op, FLAG_FREED))
1583 remove_ob (tmp); 1620 remove_ob (tmp);
1584 free_object (tmp); 1621 free_object (tmp);
1585 } 1622 }
1586 } 1623 }
1587 1624
1588 tmp1 = arch_to_object (find_archetype (arch_string)); 1625 tmp1 = arch_to_object (archetype::find (arch_string));
1589 1626
1590 tmp1->x = op->x; 1627 tmp1->x = op->x;
1591 tmp1->y = op->y; 1628 tmp1->y = op->y;
1592 insert_ob_in_map (tmp1, op->map, op, 0); 1629 insert_ob_in_map (tmp1, op->map, op, 0);
1593} 1630}
1892 */ 1929 */
1893 1930
1894int 1931int
1895check_move_on (object *op, object *originator) 1932check_move_on (object *op, object *originator)
1896{ 1933{
1897 object * 1934 object *tmp;
1898 tmp; 1935 maptile *m = op->map;
1899 tag_t
1900 tag;
1901 mapstruct *
1902 m = op->map;
1903 int
1904 x = op->x, y = op->y; 1936 int x = op->x, y = op->y;
1905 1937
1906 MoveType 1938 MoveType move_on, move_slow, move_block;
1907 move_on,
1908 move_slow,
1909 move_block;
1910 1939
1911 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1940 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912 return 0; 1941 return 0;
1913
1914 tag = op->count;
1915 1942
1916 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1943 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1944 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1945 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919 1946
1980 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2007 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 2008 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982 { 2009 {
1983 move_apply (tmp, op, originator); 2010 move_apply (tmp, op, originator);
1984 2011
1985 if (was_destroyed (op, tag)) 2012 if (op->destroyed ())
1986 return 1; 2013 return 1;
1987 2014
1988 /* what the person/creature stepped onto has moved the object 2015 /* what the person/creature stepped onto has moved the object
1989 * someplace new. Don't process any further - if we did, 2016 * someplace new. Don't process any further - if we did,
1990 * have a feeling strange problems would result. 2017 * have a feeling strange problems would result.
2002 * a matching archetype at the given map and coordinates. 2029 * a matching archetype at the given map and coordinates.
2003 * The first matching object is returned, or NULL if none. 2030 * The first matching object is returned, or NULL if none.
2004 */ 2031 */
2005 2032
2006object * 2033object *
2007present_arch (const archetype *at, mapstruct *m, int x, int y) 2034present_arch (const archetype *at, maptile *m, int x, int y)
2008{ 2035{
2009 object * 2036 object *
2010 tmp; 2037 tmp;
2011 2038
2012 if (m == NULL || out_of_map (m, x, y)) 2039 if (m == NULL || out_of_map (m, x, y))
2025 * a matching type variable at the given map and coordinates. 2052 * a matching type variable at the given map and coordinates.
2026 * The first matching object is returned, or NULL if none. 2053 * The first matching object is returned, or NULL if none.
2027 */ 2054 */
2028 2055
2029object * 2056object *
2030present (unsigned char type, mapstruct *m, int x, int y) 2057present (unsigned char type, maptile *m, int x, int y)
2031{ 2058{
2032 object * 2059 object *
2033 tmp; 2060 tmp;
2034 2061
2035 if (out_of_map (m, x, y)) 2062 if (out_of_map (m, x, y))
2175 * the archetype because that isn't correct if the monster has been 2202 * the archetype because that isn't correct if the monster has been
2176 * customized, changed states, etc. 2203 * customized, changed states, etc.
2177 */ 2204 */
2178 2205
2179int 2206int
2180find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2207find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181{ 2208{
2182 int 2209 int
2183 i, 2210 i,
2184 index = 0, flag; 2211 index = 0, flag;
2185 static int 2212 static int
2206 return -1; 2233 return -1;
2207 return altern[RANDOM () % index]; 2234 return altern[RANDOM () % index];
2208} 2235}
2209 2236
2210/* 2237/*
2211 * find_first_free_spot(archetype, mapstruct, x, y) works like 2238 * find_first_free_spot(archetype, maptile, x, y) works like
2212 * find_free_spot(), but it will search max number of squares. 2239 * find_free_spot(), but it will search max number of squares.
2213 * But it will return the first available spot, not a random choice. 2240 * But it will return the first available spot, not a random choice.
2214 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2241 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2215 */ 2242 */
2216 2243
2217int 2244int
2218find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2245find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219{ 2246{
2220 int 2247 int
2221 i; 2248 i;
2222 2249
2223 for (i = 0; i < SIZEOFFREE; i++) 2250 for (i = 0; i < SIZEOFFREE; i++)
2287 * because we have to know what movement the thing looking to move 2314 * because we have to know what movement the thing looking to move
2288 * there is capable of. 2315 * there is capable of.
2289 */ 2316 */
2290 2317
2291int 2318int
2292find_dir (mapstruct *m, int x, int y, object *exclude) 2319find_dir (maptile *m, int x, int y, object *exclude)
2293{ 2320{
2294 int 2321 int
2295 i, 2322 i,
2296 max = SIZEOFFREE, mflags; 2323 max = SIZEOFFREE, mflags;
2297 2324
2298 sint16 nx, ny; 2325 sint16 nx, ny;
2299 object * 2326 object *
2300 tmp; 2327 tmp;
2301 mapstruct * 2328 maptile *
2302 mp; 2329 mp;
2303 2330
2304 MoveType blocked, move_type; 2331 MoveType blocked, move_type;
2305 2332
2306 if (exclude && exclude->head) 2333 if (exclude && exclude->head)
2514 * Modified to be map tile aware -.MSW 2541 * Modified to be map tile aware -.MSW
2515 */ 2542 */
2516 2543
2517 2544
2518int 2545int
2519can_see_monsterP (mapstruct *m, int x, int y, int dir) 2546can_see_monsterP (maptile *m, int x, int y, int dir)
2520{ 2547{
2521 sint16 dx, dy; 2548 sint16 dx, dy;
2522 int 2549 int
2523 mflags; 2550 mflags;
2524 2551
2604 if (prev) 2631 if (prev)
2605 prev->more = tmp; 2632 prev->more = tmp;
2606 prev = tmp; 2633 prev = tmp;
2607 } 2634 }
2608 2635
2609 /*** copy inventory ***/
2610 for (item = src->inv; item; item = item->below) 2636 for (item = src->inv; item; item = item->below)
2611 {
2612 (void) insert_ob_in_ob (object_create_clone (item), dst); 2637 insert_ob_in_ob (object_create_clone (item), dst);
2613 }
2614 2638
2615 return dst; 2639 return dst;
2616} 2640}
2617 2641
2618/* return true if the object was destroyed, 0 otherwise */
2619int
2620was_destroyed (const object *op, tag_t old_tag)
2621{
2622 /* checking for FLAG_FREED isn't necessary, but makes this function more
2623 * robust */
2624 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625}
2626
2627/* GROS - Creates an object using a string representing its content. */ 2642/* GROS - Creates an object using a string representing its content. */
2628
2629/* Basically, we save the content of the string to a temp file, then call */ 2643/* Basically, we save the content of the string to a temp file, then call */
2630
2631/* load_object on it. I admit it is a highly inefficient way to make things, */ 2644/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633/* but it was simple to make and allows reusing the load_object function. */ 2645/* but it was simple to make and allows reusing the load_object function. */
2634
2635/* Remember not to use load_object_str in a time-critical situation. */ 2646/* Remember not to use load_object_str in a time-critical situation. */
2636
2637/* Also remember that multiparts objects are not supported for now. */ 2647/* Also remember that multiparts objects are not supported for now. */
2638 2648
2639object * 2649object *
2640load_object_str (const char *obstr) 2650load_object_str (const char *obstr)
2641{ 2651{
2642 object * 2652 object *op;
2643 op;
2644 char
2645 filename[MAX_BUF]; 2653 char filename[MAX_BUF];
2646 2654
2647 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2655 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648 2656
2649 FILE *
2650 tempfile = fopen (filename, "w"); 2657 FILE *tempfile = fopen (filename, "w");
2651 2658
2652 if (tempfile == NULL) 2659 if (tempfile == NULL)
2653 { 2660 {
2654 LOG (llevError, "Error - Unable to access load object temp file\n"); 2661 LOG (llevError, "Error - Unable to access load object temp file\n");
2655 return NULL; 2662 return NULL;
2656 }; 2663 }
2664
2657 fprintf (tempfile, obstr); 2665 fprintf (tempfile, obstr);
2658 fclose (tempfile); 2666 fclose (tempfile);
2659 2667
2660 op = get_object (); 2668 op = get_object ();
2661 2669
2675 * returns NULL if no match. 2683 * returns NULL if no match.
2676 */ 2684 */
2677object * 2685object *
2678find_obj_by_type_subtype (const object *who, int type, int subtype) 2686find_obj_by_type_subtype (const object *who, int type, int subtype)
2679{ 2687{
2680 object * 2688 object *tmp;
2681 tmp;
2682 2689
2683 for (tmp = who->inv; tmp; tmp = tmp->below) 2690 for (tmp = who->inv; tmp; tmp = tmp->below)
2684 if (tmp->type == type && tmp->subtype == subtype) 2691 if (tmp->type == type && tmp->subtype == subtype)
2685 return tmp; 2692 return tmp;
2686 2693
2694 * do the desired thing. 2701 * do the desired thing.
2695 */ 2702 */
2696key_value * 2703key_value *
2697get_ob_key_link (const object *ob, const char *key) 2704get_ob_key_link (const object *ob, const char *key)
2698{ 2705{
2699 key_value * 2706 key_value *link;
2700 link;
2701 2707
2702 for (link = ob->key_values; link != NULL; link = link->next) 2708 for (link = ob->key_values; link != NULL; link = link->next)
2703 {
2704 if (link->key == key) 2709 if (link->key == key)
2705 {
2706 return link; 2710 return link;
2707 }
2708 }
2709 2711
2710 return NULL; 2712 return NULL;
2711} 2713}
2712 2714
2713/* 2715/*
2718 * The returned string is shared. 2720 * The returned string is shared.
2719 */ 2721 */
2720const char * 2722const char *
2721get_ob_key_value (const object *op, const char *const key) 2723get_ob_key_value (const object *op, const char *const key)
2722{ 2724{
2723 key_value * 2725 key_value *link;
2724 link; 2726 shstr_cmp canonical_key (key);
2725 const char *
2726 canonical_key;
2727 2727
2728 canonical_key = shstr::find (key);
2729
2730 if (canonical_key == NULL) 2728 if (!canonical_key)
2731 { 2729 {
2732 /* 1. There being a field named key on any object 2730 /* 1. There being a field named key on any object
2733 * implies there'd be a shared string to find. 2731 * implies there'd be a shared string to find.
2734 * 2. Since there isn't, no object has this field. 2732 * 2. Since there isn't, no object has this field.
2735 * 3. Therefore, *this* object doesn't have this field. 2733 * 3. Therefore, *this* object doesn't have this field.
2736 */ 2734 */
2737 return NULL; 2735 return 0;
2738 } 2736 }
2739 2737
2740 /* This is copied from get_ob_key_link() above - 2738 /* This is copied from get_ob_key_link() above -
2741 * only 4 lines, and saves the function call overhead. 2739 * only 4 lines, and saves the function call overhead.
2742 */ 2740 */
2743 for (link = op->key_values; link != NULL; link = link->next) 2741 for (link = op->key_values; link; link = link->next)
2744 {
2745 if (link->key == canonical_key) 2742 if (link->key == canonical_key)
2746 {
2747 return link->value; 2743 return link->value;
2748 } 2744
2749 }
2750 return NULL; 2745 return 0;
2751} 2746}
2752 2747
2753 2748
2754/* 2749/*
2755 * Updates the canonical_key in op to value. 2750 * Updates the canonical_key in op to value.
2840{ 2835{
2841 shstr key_ (key); 2836 shstr key_ (key);
2842 2837
2843 return set_ob_key_value_s (op, key_, value, add_key); 2838 return set_ob_key_value_s (op, key_, value, add_key);
2844} 2839}
2840
2841object::depth_iterator::depth_iterator (object *container)
2842: iterator_base (container)
2843{
2844 while (item->inv)
2845 item = item->inv;
2846}
2847
2848void
2849object::depth_iterator::next ()
2850{
2851 if (item->below)
2852 {
2853 item = item->below;
2854
2855 while (item->inv)
2856 item = item->inv;
2857 }
2858 else
2859 item = item->env;
2860}
2861
2862// return a suitable string describing an objetc in enough detail to find it
2863const char *
2864object::debug_desc (char *info) const
2865{
2866 char info2[256 * 3];
2867 char *p = info;
2868
2869 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2870 count,
2871 &name,
2872 title ? " " : "",
2873 title ? (const char *)title : "");
2874
2875 if (env)
2876 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2877
2878 if (map)
2879 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2880
2881 return info;
2882}
2883
2884const char *
2885object::debug_desc () const
2886{
2887 static char info[256 * 3];
2888 return debug_desc (info);
2889}
2890

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines