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.38 by root, Wed Sep 13 01:09: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. */
… …
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
37 38
38object *objects; /* Pointer to the list of used objects */
39object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
40 40
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, 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,
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 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
43}; 43};
… …
49}; 49};
50int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
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, 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,
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 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
53}; 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}
54 131
55/* 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. */
56static int 133static int
57compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
58{ 135{
… …
297 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298 * Some error messages. 375 * Some error messages.
299 * 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.
300 */ 377 */
301 378
302void 379char *
303dump_object2 (object *op)
304{
305 errmsg[0] = 0;
306 return;
307 //TODO//D#d#
308#if 0
309 char *cp;
310
311/* object *tmp;*/
312
313 if (op->arch != NULL)
314 {
315 strcat (errmsg, "arch ");
316 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317 strcat (errmsg, "\n");
318 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319 strcat (errmsg, cp);
320# if 0
321 /* Don't dump player diffs - they are too long, mostly meaningless, and
322 * will overflow the buffer.
323 * Changed so that we don't dump inventory either. This may
324 * also overflow the buffer.
325 */
326 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327 strcat (errmsg, cp);
328 for (tmp = op->inv; tmp; tmp = tmp->below)
329 dump_object2 (tmp);
330# endif
331 strcat (errmsg, "end\n");
332 }
333 else
334 {
335 strcat (errmsg, "Object ");
336 if (op->name == NULL)
337 strcat (errmsg, "(null)");
338 else
339 strcat (errmsg, op->name);
340 strcat (errmsg, "\n");
341# if 0
342 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343 strcat (errmsg, cp);
344 for (tmp = op->inv; tmp; tmp = tmp->below)
345 dump_object2 (tmp);
346# endif
347 strcat (errmsg, "end\n");
348 }
349#endif
350}
351
352/*
353 * Dumps an object. Returns output in the static global errmsg array.
354 */
355
356void
357dump_object (object *op) 380dump_object (object *op)
358{ 381{
359 if (op == NULL) 382 if (!op)
360 { 383 return strdup ("[NULLOBJ]");
361 strcpy (errmsg, "[NULL pointer]");
362 return;
363 }
364 errmsg[0] = '\0';
365 dump_object2 (op);
366}
367 384
368void 385 object_freezer freezer;
369dump_all_objects (void) 386 save_object (freezer, op, 3);
370{ 387 return freezer.as_string ();
371 object *op;
372
373 for (op = objects; op != NULL; op = op->next)
374 {
375 dump_object (op);
376 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377 }
378} 388}
379 389
380/* 390/*
381 * 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
382 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
… …
404object * 414object *
405find_object (tag_t i) 415find_object (tag_t i)
406{ 416{
407 object *op; 417 object *op;
408 418
409 for (op = objects; op != NULL; op = op->next) 419 for (op = object::first; op != NULL; op = op->next)
410 if (op->count == i) 420 if (op->count == i)
411 break; 421 break;
422
412 return op; 423 return op;
413} 424}
414 425
415/* 426/*
416 * 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.
… …
422find_object_name (const char *str) 433find_object_name (const char *str)
423{ 434{
424 shstr_cmp str_ (str); 435 shstr_cmp str_ (str);
425 object *op; 436 object *op;
426 437
427 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
428 if (op->name == str_) 439 if (op->name == str_)
429 break; 440 break;
430 441
431 return op; 442 return op;
432} 443}
433 444
434void 445void
435free_all_object_data () 446free_all_object_data ()
436{ 447{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 448 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438}
439
440/*
441 * Returns the object which this object marks as being the owner.
442 * A id-scheme is used to avoid pointing to objects which have been
443 * freed and are now reused. If this is detected, the owner is
444 * set to NULL, and NULL is returned.
445 * Changed 2004-02-12 - if the player is setting at the play again
446 * prompt, he is removed, and we don't want to treat him as an owner of
447 * anything, so check removed flag. I don't expect that this should break
448 * anything - once an object is removed, it is basically dead anyways.
449 */
450object *
451object::get_owner ()
452{
453 if (!owner
454 || QUERY_FLAG (owner, FLAG_FREED)
455 || QUERY_FLAG (owner, FLAG_REMOVED))
456 owner = 0;
457
458 return owner;
459} 449}
460 450
461/* 451/*
462 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
463 * skill and experience objects. 453 * skill and experience objects.
… …
533 523
534 /* What is not cleared is next, prev, and count */ 524 /* What is not cleared is next, prev, and count */
535 525
536 expmul = 1.0; 526 expmul = 1.0;
537 face = blank_face; 527 face = blank_face;
538 attacked_by_count = -1;
539 528
540 if (settings.casting_time) 529 if (settings.casting_time)
541 casting_time = -1; 530 casting_time = -1;
542} 531}
543 532
… …
838 827
839 if (op->more != NULL) 828 if (op->more != NULL)
840 update_object (op->more, action); 829 update_object (op->more, action);
841} 830}
842 831
843static unordered_vector<object *> mortals; 832object::vector object::mortals;
844static std::vector<object *, slice_allocator <object *> > freed; 833object::vector object::objects; // not yet used
834object *object::first;
845 835
846void object::free_mortals () 836void object::free_mortals ()
847{ 837{
848 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 838 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849 if ((*i)->refcnt) 839 if ((*i)->refcnt)
850 ++i; // further delay freeing 840 ++i; // further delay freeing
851 else 841 else
852 { 842 {
853 freed.push_back (*i);//D
854 //delete *i; 843 delete *i;
855 mortals.erase (i); 844 mortals.erase (i);
856 } 845 }
857 846
858 if (mortals.size() && 0)//D 847 static int lastmortals = 0;//D
848
849 if (mortals.size() != lastmortals && lastmortals > 100)//D
850 {
851 lastmortals = mortals.size ();//D
859 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 852 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853 }
860} 854}
861 855
862object::object () 856object::object ()
863{ 857{
864 SET_FLAG (this, FLAG_REMOVED); 858 SET_FLAG (this, FLAG_REMOVED);
865 859
866 expmul = 1.0; 860 expmul = 1.0;
867 face = blank_face; 861 face = blank_face;
868 attacked_by_count = -1;
869} 862}
870 863
871object::~object () 864object::~object ()
872{ 865{
873 free_key_values (this); 866 free_key_values (this);
874} 867}
875 868
876void object::link () 869void object::link ()
877{ 870{
878 count = ++ob_count; 871 count = ++ob_count;
872 uuid = gen_uuid ();
879 873
880 prev = 0; 874 prev = 0;
881 next = objects; 875 next = object::first;
882 876
883 if (objects) 877 if (object::first)
884 objects->prev = this; 878 object::first->prev = this;
885 879
886 objects = this; 880 object::first = this;
887} 881}
888 882
889void object::unlink () 883void object::unlink ()
890{ 884{
891 count = 0;
892
893 if (this == objects) 885 if (this == object::first)
894 objects = next; 886 object::first = next;
895 887
896 /* Remove this object from the list of used objects */ 888 /* Remove this object from the list of used objects */
897 if (prev)
898 {
899 prev->next = next; 889 if (prev) prev->next = next;
890 if (next) next->prev = prev;
891
900 prev = 0; 892 prev = 0;
901 }
902
903 if (next)
904 {
905 next->prev = prev;
906 next = 0; 893 next = 0;
907 }
908} 894}
909 895
910object *object::create () 896object *object::create ()
911{ 897{
912 object *op;
913
914 if (freed.empty ())
915 op = new object; 898 object *op = new object;
916 else
917 {
918 // highly annoying, but the only way to get it stable right now
919 op = freed.back ();
920 freed.pop_back ();
921 op->~object ();
922 new ((void *) op) object;
923 }
924
925 op->link (); 899 op->link ();
926 return op; 900 return op;
927} 901}
928 902
929/* 903/*
… …
931 * 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
932 * free objects. The IS_FREED() flag is set in the object. 906 * free objects. The IS_FREED() flag is set in the object.
933 * The object must have been removed by remove_ob() first for 907 * The object must have been removed by remove_ob() first for
934 * this function to succeed. 908 * this function to succeed.
935 * 909 *
936 * 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
937 * inventory to the ground. 911 * inventory to the ground.
938 */ 912 */
939void object::free (bool free_inventory) 913void object::destroy (bool destroy_inventory)
940{ 914{
941 if (QUERY_FLAG (this, FLAG_FREED)) 915 if (QUERY_FLAG (this, FLAG_FREED))
942 return; 916 return;
943 917
944 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 918 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
949 923
950 SET_FLAG (this, FLAG_FREED); 924 SET_FLAG (this, FLAG_FREED);
951 925
952 if (more) 926 if (more)
953 { 927 {
954 more->free (free_inventory); 928 more->destroy (destroy_inventory);
955 more = 0; 929 more = 0;
956 } 930 }
957 931
958 if (inv) 932 if (inv)
959 { 933 {
960 /* Only if the space blocks everything do we not process - 934 /* Only if the space blocks everything do we not process -
961 * if some form of movement is allowed, let objects 935 * if some form of movement is allowed, let objects
962 * drop on that space. 936 * drop on that space.
963 */ 937 */
964 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)
965 { 939 {
966 object *op = inv; 940 object *op = inv;
967 941
968 while (op) 942 while (op)
969 { 943 {
970 object *tmp = op->below; 944 object *tmp = op->below;
971 op->free (free_inventory); 945 op->destroy (destroy_inventory);
972 op = tmp; 946 op = tmp;
973 } 947 }
974 } 948 }
975 else 949 else
976 { /* Put objects in inventory onto this space */ 950 { /* Put objects in inventory onto this space */
… …
995 op = tmp; 969 op = tmp;
996 } 970 }
997 } 971 }
998 } 972 }
999 973
974 // clear those pointers that likely might have circular references to us
1000 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;
1001 981
1002 /* Remove object from the active list */ 982 /* Remove object from the active list */
1003 speed = 0; 983 speed = 0;
1004 update_ob_speed (this); 984 update_ob_speed (this);
1005 985
… …
1017sub_weight (object *op, signed long weight) 997sub_weight (object *op, signed long weight)
1018{ 998{
1019 while (op != NULL) 999 while (op != NULL)
1020 { 1000 {
1021 if (op->type == CONTAINER) 1001 if (op->type == CONTAINER)
1022 {
1023 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1002 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024 } 1003
1025 op->carrying -= weight; 1004 op->carrying -= weight;
1026 op = op->env; 1005 op = op->env;
1027 } 1006 }
1028} 1007}
1029 1008
… …
1037 */ 1016 */
1038 1017
1039void 1018void
1040remove_ob (object *op) 1019remove_ob (object *op)
1041{ 1020{
1021 object *tmp, *last = 0;
1042 object * 1022 object *otmp;
1043 tmp, *
1044 last = NULL;
1045 object *
1046 otmp;
1047 1023
1048 tag_t
1049 tag;
1050 int
1051 check_walk_off; 1024 int check_walk_off;
1052 mapstruct * 1025 maptile *m;
1053 m;
1054 1026
1055 sint16 1027 sint16 x, y;
1056 x,
1057 y;
1058 1028
1059 if (QUERY_FLAG (op, FLAG_REMOVED)) 1029 if (QUERY_FLAG (op, FLAG_REMOVED))
1060 return; 1030 return;
1061 1031
1062 SET_FLAG (op, FLAG_REMOVED); 1032 SET_FLAG (op, FLAG_REMOVED);
… …
1139 * use translated coordinates in case some oddness with map tiling is 1109 * use translated coordinates in case some oddness with map tiling is
1140 * evident 1110 * evident
1141 */ 1111 */
1142 if (GET_MAP_OB (m, x, y) != op) 1112 if (GET_MAP_OB (m, x, y) != op)
1143 { 1113 {
1144 dump_object (op); 1114 char *dump = dump_object (op);
1145 LOG (llevError, 1115 LOG (llevError,
1146 "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);
1147 dump_object (GET_MAP_OB (m, x, y)); 1118 dump = dump_object (GET_MAP_OB (m, x, y));
1148 LOG (llevError, "%s\n", errmsg); 1119 LOG (llevError, "%s\n", dump);
1120 free (dump);
1149 } 1121 }
1150 1122
1151 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. */
1152 } 1124 }
1153 1125
… …
1155 op->below = 0; 1127 op->below = 0;
1156 1128
1157 if (op->map->in_memory == MAP_SAVING) 1129 if (op->map->in_memory == MAP_SAVING)
1158 return; 1130 return;
1159 1131
1160 tag = op->count;
1161 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1132 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162 1133
1163 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)
1164 { 1135 {
1165 /* 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
… …
1180 1151
1181 tmp->contr->socket.update_look = 1; 1152 tmp->contr->socket.update_look = 1;
1182 } 1153 }
1183 1154
1184 /* See if player moving off should effect something */ 1155 /* See if player moving off should effect something */
1185 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))
1186 { 1159 {
1187 move_apply (tmp, op, NULL); 1160 move_apply (tmp, op, NULL);
1188 1161
1189 if (was_destroyed (op, tag)) 1162 if (op->destroyed ())
1190 {
1191 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 ());
1192 }
1193 } 1164 }
1194 1165
1195 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1166 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196 1167
1197 if (tmp->above == tmp) 1168 if (tmp->above == tmp)
… …
1250 free_object (op); 1221 free_object (op);
1251 return top; 1222 return top;
1252 } 1223 }
1253 } 1224 }
1254 1225
1255 return NULL; 1226 return 0;
1256} 1227}
1257 1228
1258/* 1229/*
1259 * 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
1260 * job preparing multi-part monsters 1231 * job preparing multi-part monsters
1261 */ 1232 */
1262object * 1233object *
1263insert_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)
1264{ 1235{
1265 object *tmp; 1236 object *tmp;
1266 1237
1267 if (op->head) 1238 if (op->head)
1268 op = op->head; 1239 op = op->head;
… …
1296 * NULL if 'op' was destroyed 1267 * NULL if 'op' was destroyed
1297 * just 'op' otherwise 1268 * just 'op' otherwise
1298 */ 1269 */
1299 1270
1300object * 1271object *
1301insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302{ 1273{
1303 object *tmp, *top, *floor = NULL; 1274 object *tmp, *top, *floor = NULL;
1304 sint16 x, y; 1275 sint16 x, y;
1305 1276
1306 if (QUERY_FLAG (op, FLAG_FREED)) 1277 if (QUERY_FLAG (op, FLAG_FREED))
… …
1309 return NULL; 1280 return NULL;
1310 } 1281 }
1311 1282
1312 if (m == NULL) 1283 if (m == NULL)
1313 { 1284 {
1314 dump_object (op); 1285 char *dump = dump_object (op);
1315 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);
1316 return op; 1288 return op;
1317 } 1289 }
1318 1290
1319 if (out_of_map (m, op->x, op->y)) 1291 if (out_of_map (m, op->x, op->y))
1320 { 1292 {
1321 dump_object (op); 1293 char *dump = dump_object (op);
1322 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);
1323#ifdef MANY_CORES 1295#ifdef MANY_CORES
1324 /* 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
1325 * 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
1326 * improperly inserted. 1298 * improperly inserted.
1327 */ 1299 */
1328 abort (); 1300 abort ();
1329#endif 1301#endif
1302 free (dump);
1330 return op; 1303 return op;
1331 } 1304 }
1332 1305
1333 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1306 if (!QUERY_FLAG (op, FLAG_REMOVED))
1334 { 1307 {
1335 dump_object (op); 1308 char *dump = dump_object (op);
1336 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);
1337 return op; 1311 return op;
1338 } 1312 }
1339 1313
1340 if (op->more != NULL) 1314 if (op->more != NULL)
1341 { 1315 {
… …
1587 remove_ob (tmp); 1561 remove_ob (tmp);
1588 free_object (tmp); 1562 free_object (tmp);
1589 } 1563 }
1590 } 1564 }
1591 1565
1592 tmp1 = arch_to_object (find_archetype (arch_string)); 1566 tmp1 = arch_to_object (archetype::find (arch_string));
1593 1567
1594 tmp1->x = op->x; 1568 tmp1->x = op->x;
1595 tmp1->y = op->y; 1569 tmp1->y = op->y;
1596 insert_ob_in_map (tmp1, op->map, op, 0); 1570 insert_ob_in_map (tmp1, op->map, op, 0);
1597} 1571}
… …
1778 tmp, * 1752 tmp, *
1779 otmp; 1753 otmp;
1780 1754
1781 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1755 if (!QUERY_FLAG (op, FLAG_REMOVED))
1782 { 1756 {
1783 dump_object (op); 1757 char *dump = dump_object (op);
1784 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);
1785 return op; 1760 return op;
1786 } 1761 }
1787 1762
1788 if (where == NULL) 1763 if (where == NULL)
1789 { 1764 {
1790 dump_object (op); 1765 char *dump = dump_object (op);
1791 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);
1792 return op; 1768 return op;
1793 } 1769 }
1794 1770
1795 if (where->head) 1771 if (where->head)
1796 { 1772 {
… …
1896 */ 1872 */
1897 1873
1898int 1874int
1899check_move_on (object *op, object *originator) 1875check_move_on (object *op, object *originator)
1900{ 1876{
1901 object * 1877 object *tmp;
1902 tmp; 1878 maptile *m = op->map;
1903 tag_t
1904 tag;
1905 mapstruct *
1906 m = op->map;
1907 int
1908 x = op->x, y = op->y; 1879 int x = op->x, y = op->y;
1909 1880
1910 MoveType 1881 MoveType move_on, move_slow, move_block;
1911 move_on,
1912 move_slow,
1913 move_block;
1914 1882
1915 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1883 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916 return 0; 1884 return 0;
1917
1918 tag = op->count;
1919 1885
1920 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);
1921 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);
1922 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);
1923 1889
… …
1984 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1950 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985 ((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))
1986 { 1952 {
1987 move_apply (tmp, op, originator); 1953 move_apply (tmp, op, originator);
1988 1954
1989 if (was_destroyed (op, tag)) 1955 if (op->destroyed ())
1990 return 1; 1956 return 1;
1991 1957
1992 /* what the person/creature stepped onto has moved the object 1958 /* what the person/creature stepped onto has moved the object
1993 * someplace new. Don't process any further - if we did, 1959 * someplace new. Don't process any further - if we did,
1994 * have a feeling strange problems would result. 1960 * have a feeling strange problems would result.
… …
2006 * a matching archetype at the given map and coordinates. 1972 * a matching archetype at the given map and coordinates.
2007 * The first matching object is returned, or NULL if none. 1973 * The first matching object is returned, or NULL if none.
2008 */ 1974 */
2009 1975
2010object * 1976object *
2011present_arch (const archetype *at, mapstruct *m, int x, int y) 1977present_arch (const archetype *at, maptile *m, int x, int y)
2012{ 1978{
2013 object * 1979 object *
2014 tmp; 1980 tmp;
2015 1981
2016 if (m == NULL || out_of_map (m, x, y)) 1982 if (m == NULL || out_of_map (m, x, y))
… …
2029 * a matching type variable at the given map and coordinates. 1995 * a matching type variable at the given map and coordinates.
2030 * The first matching object is returned, or NULL if none. 1996 * The first matching object is returned, or NULL if none.
2031 */ 1997 */
2032 1998
2033object * 1999object *
2034present (unsigned char type, mapstruct *m, int x, int y) 2000present (unsigned char type, maptile *m, int x, int y)
2035{ 2001{
2036 object * 2002 object *
2037 tmp; 2003 tmp;
2038 2004
2039 if (out_of_map (m, x, y)) 2005 if (out_of_map (m, x, y))
… …
2179 * 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
2180 * customized, changed states, etc. 2146 * customized, changed states, etc.
2181 */ 2147 */
2182 2148
2183int 2149int
2184find_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)
2185{ 2151{
2186 int 2152 int
2187 i, 2153 i,
2188 index = 0, flag; 2154 index = 0, flag;
2189 static int 2155 static int
… …
2210 return -1; 2176 return -1;
2211 return altern[RANDOM () % index]; 2177 return altern[RANDOM () % index];
2212} 2178}
2213 2179
2214/* 2180/*
2215 * find_first_free_spot(archetype, mapstruct, x, y) works like 2181 * find_first_free_spot(archetype, maptile, x, y) works like
2216 * find_free_spot(), but it will search max number of squares. 2182 * find_free_spot(), but it will search max number of squares.
2217 * 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.
2218 * 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.
2219 */ 2185 */
2220 2186
2221int 2187int
2222find_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)
2223{ 2189{
2224 int 2190 int
2225 i; 2191 i;
2226 2192
2227 for (i = 0; i < SIZEOFFREE; i++) 2193 for (i = 0; i < SIZEOFFREE; i++)
… …
2291 * 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
2292 * there is capable of. 2258 * there is capable of.
2293 */ 2259 */
2294 2260
2295int 2261int
2296find_dir (mapstruct *m, int x, int y, object *exclude) 2262find_dir (maptile *m, int x, int y, object *exclude)
2297{ 2263{
2298 int 2264 int
2299 i, 2265 i,
2300 max = SIZEOFFREE, mflags; 2266 max = SIZEOFFREE, mflags;
2301 2267
2302 sint16 nx, ny; 2268 sint16 nx, ny;
2303 object * 2269 object *
2304 tmp; 2270 tmp;
2305 mapstruct * 2271 maptile *
2306 mp; 2272 mp;
2307 2273
2308 MoveType blocked, move_type; 2274 MoveType blocked, move_type;
2309 2275
2310 if (exclude && exclude->head) 2276 if (exclude && exclude->head)
… …
2518 * Modified to be map tile aware -.MSW 2484 * Modified to be map tile aware -.MSW
2519 */ 2485 */
2520 2486
2521 2487
2522int 2488int
2523can_see_monsterP (mapstruct *m, int x, int y, int dir) 2489can_see_monsterP (maptile *m, int x, int y, int dir)
2524{ 2490{
2525 sint16 dx, dy; 2491 sint16 dx, dy;
2526 int 2492 int
2527 mflags; 2493 mflags;
2528 2494
… …
2608 if (prev) 2574 if (prev)
2609 prev->more = tmp; 2575 prev->more = tmp;
2610 prev = tmp; 2576 prev = tmp;
2611 } 2577 }
2612 2578
2613 /*** copy inventory ***/
2614 for (item = src->inv; item; item = item->below) 2579 for (item = src->inv; item; item = item->below)
2615 {
2616 (void) insert_ob_in_ob (object_create_clone (item), dst); 2580 insert_ob_in_ob (object_create_clone (item), dst);
2617 }
2618 2581
2619 return dst; 2582 return dst;
2620} 2583}
2621 2584
2622/* return true if the object was destroyed, 0 otherwise */
2623int
2624was_destroyed (const object *op, tag_t old_tag)
2625{
2626 /* checking for FLAG_FREED isn't necessary, but makes this function more
2627 * robust */
2628 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629}
2630
2631/* GROS - Creates an object using a string representing its content. */ 2585/* GROS - Creates an object using a string representing its content. */
2632
2633/* 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 */
2634
2635/* 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, */
2636
2637/* 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. */
2638
2639/* 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. */
2640
2641/* Also remember that multiparts objects are not supported for now. */ 2590/* Also remember that multiparts objects are not supported for now. */
2642 2591
2643object * 2592object *
2644load_object_str (const char *obstr) 2593load_object_str (const char *obstr)
2645{ 2594{
2646 object * 2595 object *op;
2647 op;
2648 char
2649 filename[MAX_BUF]; 2596 char filename[MAX_BUF];
2650 2597
2651 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2598 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652 2599
2653 FILE *
2654 tempfile = fopen (filename, "w"); 2600 FILE *tempfile = fopen (filename, "w");
2655 2601
2656 if (tempfile == NULL) 2602 if (tempfile == NULL)
2657 { 2603 {
2658 LOG (llevError, "Error - Unable to access load object temp file\n"); 2604 LOG (llevError, "Error - Unable to access load object temp file\n");
2659 return NULL; 2605 return NULL;
2660 }; 2606 }
2607
2661 fprintf (tempfile, obstr); 2608 fprintf (tempfile, obstr);
2662 fclose (tempfile); 2609 fclose (tempfile);
2663 2610
2664 op = get_object (); 2611 op = get_object ();
2665 2612
… …
2679 * returns NULL if no match. 2626 * returns NULL if no match.
2680 */ 2627 */
2681object * 2628object *
2682find_obj_by_type_subtype (const object *who, int type, int subtype) 2629find_obj_by_type_subtype (const object *who, int type, int subtype)
2683{ 2630{
2684 object * 2631 object *tmp;
2685 tmp;
2686 2632
2687 for (tmp = who->inv; tmp; tmp = tmp->below) 2633 for (tmp = who->inv; tmp; tmp = tmp->below)
2688 if (tmp->type == type && tmp->subtype == subtype) 2634 if (tmp->type == type && tmp->subtype == subtype)
2689 return tmp; 2635 return tmp;
2690 2636
… …
2698 * do the desired thing. 2644 * do the desired thing.
2699 */ 2645 */
2700key_value * 2646key_value *
2701get_ob_key_link (const object *ob, const char *key) 2647get_ob_key_link (const object *ob, const char *key)
2702{ 2648{
2703 key_value * 2649 key_value *link;
2704 link;
2705 2650
2706 for (link = ob->key_values; link != NULL; link = link->next) 2651 for (link = ob->key_values; link != NULL; link = link->next)
2707 {
2708 if (link->key == key) 2652 if (link->key == key)
2709 {
2710 return link; 2653 return link;
2711 }
2712 }
2713 2654
2714 return NULL; 2655 return NULL;
2715} 2656}
2716 2657
2717/* 2658/*

Diff Legend

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