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.55 by root, Sun Dec 3 00:41:33 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
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.
… …
402 */ 412 */
403 413
404object * 414object *
405find_object (tag_t i) 415find_object (tag_t i)
406{ 416{
407 object *op; 417 for (object *op = object::first; op; op = op->next)
408
409 for (op = objects; op != NULL; op = op->next)
410 if (op->count == i) 418 if (op->count == i)
411 break; 419 return op;
420
412 return op; 421 return 0;
413} 422}
414 423
415/* 424/*
416 * 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.
417 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
… …
422find_object_name (const char *str) 431find_object_name (const char *str)
423{ 432{
424 shstr_cmp str_ (str); 433 shstr_cmp str_ (str);
425 object *op; 434 object *op;
426 435
427 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
428 if (op->name == str_) 437 if (op->name == str_)
429 break; 438 break;
430 439
431 return op; 440 return op;
432} 441}
433 442
434void 443void
435free_all_object_data () 444free_all_object_data ()
436{ 445{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 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} 447}
460 448
461/* 449/*
462 * 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
463 * skill and experience objects. 451 * skill and experience objects.
… …
533 521
534 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
535 523
536 expmul = 1.0; 524 expmul = 1.0;
537 face = blank_face; 525 face = blank_face;
538 attacked_by_count = -1;
539 526
540 if (settings.casting_time) 527 if (settings.casting_time)
541 casting_time = -1; 528 casting_time = -1;
542} 529}
543 530
… …
838 825
839 if (op->more != NULL) 826 if (op->more != NULL)
840 update_object (op->more, action); 827 update_object (op->more, action);
841} 828}
842 829
843static unordered_vector<object *> mortals; 830object::vector object::mortals;
844static std::vector<object *, slice_allocator <object *> > freed; 831object::vector object::objects; // not yet used
832object *object::first;
845 833
846void object::free_mortals () 834void object::free_mortals ()
847{ 835{
848 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849 if ((*i)->refcnt) 837 if ((*i)->refcnt)
850 ++i; // further delay freeing 838 ++i; // further delay freeing
851 else 839 else
852 { 840 {
853 freed.push_back (*i);//D
854 //delete *i; 841 delete *i;
855 mortals.erase (i); 842 mortals.erase (i);
856 } 843 }
857 844
858 if (mortals.size() && 0)//D 845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
859 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
860} 852}
861 853
862object::object () 854object::object ()
863{ 855{
864 SET_FLAG (this, FLAG_REMOVED); 856 SET_FLAG (this, FLAG_REMOVED);
865 857
866 expmul = 1.0; 858 expmul = 1.0;
867 face = blank_face; 859 face = blank_face;
868 attacked_by_count = -1;
869} 860}
870 861
871object::~object () 862object::~object ()
872{ 863{
873 free_key_values (this); 864 free_key_values (this);
874} 865}
875 866
876void object::link () 867void object::link ()
877{ 868{
878 count = ++ob_count; 869 count = ++ob_count;
870 uuid = gen_uuid ();
879 871
880 prev = 0; 872 prev = 0;
881 next = objects; 873 next = object::first;
882 874
883 if (objects) 875 if (object::first)
884 objects->prev = this; 876 object::first->prev = this;
885 877
886 objects = this; 878 object::first = this;
887} 879}
888 880
889void object::unlink () 881void object::unlink ()
890{ 882{
891 count = 0;
892
893 if (this == objects) 883 if (this == object::first)
894 objects = next; 884 object::first = next;
895 885
896 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
897 if (prev)
898 {
899 prev->next = next; 887 if (prev) prev->next = next;
888 if (next) next->prev = prev;
889
900 prev = 0; 890 prev = 0;
901 }
902
903 if (next)
904 {
905 next->prev = prev;
906 next = 0; 891 next = 0;
907 }
908} 892}
909 893
910object *object::create () 894object *object::create ()
911{ 895{
912 object *op;
913
914 if (freed.empty ())
915 op = new object; 896 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 (); 897 op->link ();
926 return op; 898 return op;
927} 899}
928 900
929/* 901/*
… …
931 * 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
932 * free objects. The IS_FREED() flag is set in the object. 904 * free objects. The IS_FREED() flag is set in the object.
933 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
934 * this function to succeed. 906 * this function to succeed.
935 * 907 *
936 * 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
937 * inventory to the ground. 909 * inventory to the ground.
938 */ 910 */
939void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
940{ 912{
941 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
942 return; 914 return;
943 915
944 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
… …
947 if (!QUERY_FLAG (this, FLAG_REMOVED)) 919 if (!QUERY_FLAG (this, FLAG_REMOVED))
948 remove_ob (this); 920 remove_ob (this);
949 921
950 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
951 923
924 // hack to ensure that freed objects still have a valid map
925 {
926 static maptile *freed_map; // freed objects are moved here to avoid crashes
927
928 if (!freed_map)
929 {
930 freed_map = get_empty_map (3, 3);
931 freed_map->name = "freed objects map";
932 allocate_map (freed_map);
933 }
934
935 map = freed_map;
936 x = 1;
937 y = 1;
938 }
939
952 if (more) 940 if (more)
953 { 941 {
954 more->free (free_inventory); 942 more->destroy (destroy_inventory);
955 more = 0; 943 more = 0;
956 } 944 }
957 945
958 if (inv) 946 if (inv)
959 { 947 {
960 /* Only if the space blocks everything do we not process - 948 /* Only if the space blocks everything do we not process -
961 * if some form of movement is allowed, let objects 949 * if some form of movement is allowed, let objects
962 * drop on that space. 950 * drop on that space.
963 */ 951 */
964 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 952 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965 { 953 {
966 object *op = inv; 954 object *op = inv;
967 955
968 while (op) 956 while (op)
969 { 957 {
970 object *tmp = op->below; 958 object *tmp = op->below;
971 op->free (free_inventory); 959 op->destroy (destroy_inventory);
972 op = tmp; 960 op = tmp;
973 } 961 }
974 } 962 }
975 else 963 else
976 { /* Put objects in inventory onto this space */ 964 { /* Put objects in inventory onto this space */
… …
995 op = tmp; 983 op = tmp;
996 } 984 }
997 } 985 }
998 } 986 }
999 987
988 // clear those pointers that likely might have circular references to us
1000 owner = 0; 989 owner = 0;
990 enemy = 0;
991 attacked_by = 0;
992
993 // only relevant for players(?), but make sure of it anyways
994 contr = 0;
1001 995
1002 /* Remove object from the active list */ 996 /* Remove object from the active list */
1003 speed = 0; 997 speed = 0;
1004 update_ob_speed (this); 998 update_ob_speed (this);
1005 999
… …
1017sub_weight (object *op, signed long weight) 1011sub_weight (object *op, signed long weight)
1018{ 1012{
1019 while (op != NULL) 1013 while (op != NULL)
1020 { 1014 {
1021 if (op->type == CONTAINER) 1015 if (op->type == CONTAINER)
1022 {
1023 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1016 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024 } 1017
1025 op->carrying -= weight; 1018 op->carrying -= weight;
1026 op = op->env; 1019 op = op->env;
1027 } 1020 }
1028} 1021}
1029 1022
… …
1037 */ 1030 */
1038 1031
1039void 1032void
1040remove_ob (object *op) 1033remove_ob (object *op)
1041{ 1034{
1035 object *tmp, *last = 0;
1042 object * 1036 object *otmp;
1043 tmp, *
1044 last = NULL;
1045 object *
1046 otmp;
1047 1037
1048 tag_t
1049 tag;
1050 int
1051 check_walk_off; 1038 int check_walk_off;
1052 mapstruct * 1039 maptile *m;
1053 m;
1054 1040
1055 sint16 1041 sint16 x, y;
1056 x,
1057 y;
1058 1042
1059 if (QUERY_FLAG (op, FLAG_REMOVED)) 1043 if (QUERY_FLAG (op, FLAG_REMOVED))
1060 return; 1044 return;
1061 1045
1062 SET_FLAG (op, FLAG_REMOVED); 1046 SET_FLAG (op, FLAG_REMOVED);
… …
1139 * use translated coordinates in case some oddness with map tiling is 1123 * use translated coordinates in case some oddness with map tiling is
1140 * evident 1124 * evident
1141 */ 1125 */
1142 if (GET_MAP_OB (m, x, y) != op) 1126 if (GET_MAP_OB (m, x, y) != op)
1143 { 1127 {
1144 dump_object (op); 1128 char *dump = dump_object (op);
1145 LOG (llevError, 1129 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); 1130 "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);
1131 free (dump);
1147 dump_object (GET_MAP_OB (m, x, y)); 1132 dump = dump_object (GET_MAP_OB (m, x, y));
1148 LOG (llevError, "%s\n", errmsg); 1133 LOG (llevError, "%s\n", dump);
1134 free (dump);
1149 } 1135 }
1150 1136
1151 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1137 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1152 } 1138 }
1153 1139
… …
1155 op->below = 0; 1141 op->below = 0;
1156 1142
1157 if (op->map->in_memory == MAP_SAVING) 1143 if (op->map->in_memory == MAP_SAVING)
1158 return; 1144 return;
1159 1145
1160 tag = op->count;
1161 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1146 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162 1147
1163 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1148 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1164 { 1149 {
1165 /* No point updating the players look faces if he is the object 1150 /* No point updating the players look faces if he is the object
… …
1180 1165
1181 tmp->contr->socket.update_look = 1; 1166 tmp->contr->socket.update_look = 1;
1182 } 1167 }
1183 1168
1184 /* See if player moving off should effect something */ 1169 /* 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)) 1170 if (check_walk_off
1171 && ((op->move_type & tmp->move_off)
1172 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186 { 1173 {
1187 move_apply (tmp, op, NULL); 1174 move_apply (tmp, op, NULL);
1188 1175
1189 if (was_destroyed (op, tag)) 1176 if (op->destroyed ())
1190 {
1191 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1177 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192 }
1193 } 1178 }
1194 1179
1195 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1180 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196 1181
1197 if (tmp->above == tmp) 1182 if (tmp->above == tmp)
… …
1250 free_object (op); 1235 free_object (op);
1251 return top; 1236 return top;
1252 } 1237 }
1253 } 1238 }
1254 1239
1255 return NULL; 1240 return 0;
1256} 1241}
1257 1242
1258/* 1243/*
1259 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1244 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1260 * job preparing multi-part monsters 1245 * job preparing multi-part monsters
1261 */ 1246 */
1262object * 1247object *
1263insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1248insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264{ 1249{
1265 object *tmp; 1250 object *tmp;
1266 1251
1267 if (op->head) 1252 if (op->head)
1268 op = op->head; 1253 op = op->head;
… …
1296 * NULL if 'op' was destroyed 1281 * NULL if 'op' was destroyed
1297 * just 'op' otherwise 1282 * just 'op' otherwise
1298 */ 1283 */
1299 1284
1300object * 1285object *
1301insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302{ 1287{
1303 object *tmp, *top, *floor = NULL; 1288 object *tmp, *top, *floor = NULL;
1304 sint16 x, y; 1289 sint16 x, y;
1305 1290
1306 if (QUERY_FLAG (op, FLAG_FREED)) 1291 if (QUERY_FLAG (op, FLAG_FREED))
… …
1309 return NULL; 1294 return NULL;
1310 } 1295 }
1311 1296
1312 if (m == NULL) 1297 if (m == NULL)
1313 { 1298 {
1314 dump_object (op); 1299 char *dump = dump_object (op);
1315 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1300 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1301 free (dump);
1316 return op; 1302 return op;
1317 } 1303 }
1318 1304
1319 if (out_of_map (m, op->x, op->y)) 1305 if (out_of_map (m, op->x, op->y))
1320 { 1306 {
1321 dump_object (op); 1307 char *dump = dump_object (op);
1322 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1308 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323#ifdef MANY_CORES 1309#ifdef MANY_CORES
1324 /* Better to catch this here, as otherwise the next use of this object 1310 /* 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 1311 * is likely to cause a crash. Better to find out where it is getting
1326 * improperly inserted. 1312 * improperly inserted.
1327 */ 1313 */
1328 abort (); 1314 abort ();
1329#endif 1315#endif
1316 free (dump);
1330 return op; 1317 return op;
1331 } 1318 }
1332 1319
1333 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1320 if (!QUERY_FLAG (op, FLAG_REMOVED))
1334 { 1321 {
1335 dump_object (op); 1322 char *dump = dump_object (op);
1336 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1323 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1324 free (dump);
1337 return op; 1325 return op;
1338 } 1326 }
1339 1327
1340 if (op->more != NULL) 1328 if (op->more != NULL)
1341 { 1329 {
… …
1587 remove_ob (tmp); 1575 remove_ob (tmp);
1588 free_object (tmp); 1576 free_object (tmp);
1589 } 1577 }
1590 } 1578 }
1591 1579
1592 tmp1 = arch_to_object (find_archetype (arch_string)); 1580 tmp1 = arch_to_object (archetype::find (arch_string));
1593 1581
1594 tmp1->x = op->x; 1582 tmp1->x = op->x;
1595 tmp1->y = op->y; 1583 tmp1->y = op->y;
1596 insert_ob_in_map (tmp1, op->map, op, 0); 1584 insert_ob_in_map (tmp1, op->map, op, 0);
1597} 1585}
… …
1778 tmp, * 1766 tmp, *
1779 otmp; 1767 otmp;
1780 1768
1781 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1769 if (!QUERY_FLAG (op, FLAG_REMOVED))
1782 { 1770 {
1783 dump_object (op); 1771 char *dump = dump_object (op);
1784 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1772 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773 free (dump);
1785 return op; 1774 return op;
1786 } 1775 }
1787 1776
1788 if (where == NULL) 1777 if (where == NULL)
1789 { 1778 {
1790 dump_object (op); 1779 char *dump = dump_object (op);
1791 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1780 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1781 free (dump);
1792 return op; 1782 return op;
1793 } 1783 }
1794 1784
1795 if (where->head) 1785 if (where->head)
1796 { 1786 {
… …
1896 */ 1886 */
1897 1887
1898int 1888int
1899check_move_on (object *op, object *originator) 1889check_move_on (object *op, object *originator)
1900{ 1890{
1901 object * 1891 object *tmp;
1902 tmp; 1892 maptile *m = op->map;
1903 tag_t
1904 tag;
1905 mapstruct *
1906 m = op->map;
1907 int
1908 x = op->x, y = op->y; 1893 int x = op->x, y = op->y;
1909 1894
1910 MoveType 1895 MoveType move_on, move_slow, move_block;
1911 move_on,
1912 move_slow,
1913 move_block;
1914 1896
1915 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1897 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916 return 0; 1898 return 0;
1917
1918 tag = op->count;
1919 1899
1920 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1900 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); 1901 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); 1902 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923 1903
… …
1984 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1964 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)) 1965 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986 { 1966 {
1987 move_apply (tmp, op, originator); 1967 move_apply (tmp, op, originator);
1988 1968
1989 if (was_destroyed (op, tag)) 1969 if (op->destroyed ())
1990 return 1; 1970 return 1;
1991 1971
1992 /* what the person/creature stepped onto has moved the object 1972 /* what the person/creature stepped onto has moved the object
1993 * someplace new. Don't process any further - if we did, 1973 * someplace new. Don't process any further - if we did,
1994 * have a feeling strange problems would result. 1974 * have a feeling strange problems would result.
… …
2006 * a matching archetype at the given map and coordinates. 1986 * a matching archetype at the given map and coordinates.
2007 * The first matching object is returned, or NULL if none. 1987 * The first matching object is returned, or NULL if none.
2008 */ 1988 */
2009 1989
2010object * 1990object *
2011present_arch (const archetype *at, mapstruct *m, int x, int y) 1991present_arch (const archetype *at, maptile *m, int x, int y)
2012{ 1992{
2013 object * 1993 object *
2014 tmp; 1994 tmp;
2015 1995
2016 if (m == NULL || out_of_map (m, x, y)) 1996 if (m == NULL || out_of_map (m, x, y))
… …
2029 * a matching type variable at the given map and coordinates. 2009 * a matching type variable at the given map and coordinates.
2030 * The first matching object is returned, or NULL if none. 2010 * The first matching object is returned, or NULL if none.
2031 */ 2011 */
2032 2012
2033object * 2013object *
2034present (unsigned char type, mapstruct *m, int x, int y) 2014present (unsigned char type, maptile *m, int x, int y)
2035{ 2015{
2036 object * 2016 object *
2037 tmp; 2017 tmp;
2038 2018
2039 if (out_of_map (m, x, y)) 2019 if (out_of_map (m, x, y))
… …
2179 * the archetype because that isn't correct if the monster has been 2159 * the archetype because that isn't correct if the monster has been
2180 * customized, changed states, etc. 2160 * customized, changed states, etc.
2181 */ 2161 */
2182 2162
2183int 2163int
2184find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2164find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185{ 2165{
2186 int 2166 int
2187 i, 2167 i,
2188 index = 0, flag; 2168 index = 0, flag;
2189 static int 2169 static int
… …
2210 return -1; 2190 return -1;
2211 return altern[RANDOM () % index]; 2191 return altern[RANDOM () % index];
2212} 2192}
2213 2193
2214/* 2194/*
2215 * find_first_free_spot(archetype, mapstruct, x, y) works like 2195 * find_first_free_spot(archetype, maptile, x, y) works like
2216 * find_free_spot(), but it will search max number of squares. 2196 * find_free_spot(), but it will search max number of squares.
2217 * But it will return the first available spot, not a random choice. 2197 * 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. 2198 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2219 */ 2199 */
2220 2200
2221int 2201int
2222find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2202find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223{ 2203{
2224 int 2204 int
2225 i; 2205 i;
2226 2206
2227 for (i = 0; i < SIZEOFFREE; i++) 2207 for (i = 0; i < SIZEOFFREE; i++)
… …
2291 * because we have to know what movement the thing looking to move 2271 * because we have to know what movement the thing looking to move
2292 * there is capable of. 2272 * there is capable of.
2293 */ 2273 */
2294 2274
2295int 2275int
2296find_dir (mapstruct *m, int x, int y, object *exclude) 2276find_dir (maptile *m, int x, int y, object *exclude)
2297{ 2277{
2298 int 2278 int
2299 i, 2279 i,
2300 max = SIZEOFFREE, mflags; 2280 max = SIZEOFFREE, mflags;
2301 2281
2302 sint16 nx, ny; 2282 sint16 nx, ny;
2303 object * 2283 object *
2304 tmp; 2284 tmp;
2305 mapstruct * 2285 maptile *
2306 mp; 2286 mp;
2307 2287
2308 MoveType blocked, move_type; 2288 MoveType blocked, move_type;
2309 2289
2310 if (exclude && exclude->head) 2290 if (exclude && exclude->head)
… …
2518 * Modified to be map tile aware -.MSW 2498 * Modified to be map tile aware -.MSW
2519 */ 2499 */
2520 2500
2521 2501
2522int 2502int
2523can_see_monsterP (mapstruct *m, int x, int y, int dir) 2503can_see_monsterP (maptile *m, int x, int y, int dir)
2524{ 2504{
2525 sint16 dx, dy; 2505 sint16 dx, dy;
2526 int 2506 int
2527 mflags; 2507 mflags;
2528 2508
… …
2608 if (prev) 2588 if (prev)
2609 prev->more = tmp; 2589 prev->more = tmp;
2610 prev = tmp; 2590 prev = tmp;
2611 } 2591 }
2612 2592
2613 /*** copy inventory ***/
2614 for (item = src->inv; item; item = item->below) 2593 for (item = src->inv; item; item = item->below)
2615 {
2616 (void) insert_ob_in_ob (object_create_clone (item), dst); 2594 insert_ob_in_ob (object_create_clone (item), dst);
2617 }
2618 2595
2619 return dst; 2596 return dst;
2620} 2597}
2621 2598
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. */ 2599/* 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 */ 2600/* 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, */ 2601/* 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. */ 2602/* 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. */ 2603/* Remember not to use load_object_str in a time-critical situation. */
2640
2641/* Also remember that multiparts objects are not supported for now. */ 2604/* Also remember that multiparts objects are not supported for now. */
2642 2605
2643object * 2606object *
2644load_object_str (const char *obstr) 2607load_object_str (const char *obstr)
2645{ 2608{
2646 object * 2609 object *op;
2647 op;
2648 char
2649 filename[MAX_BUF]; 2610 char filename[MAX_BUF];
2650 2611
2651 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2612 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652 2613
2653 FILE *
2654 tempfile = fopen (filename, "w"); 2614 FILE *tempfile = fopen (filename, "w");
2655 2615
2656 if (tempfile == NULL) 2616 if (tempfile == NULL)
2657 { 2617 {
2658 LOG (llevError, "Error - Unable to access load object temp file\n"); 2618 LOG (llevError, "Error - Unable to access load object temp file\n");
2659 return NULL; 2619 return NULL;
2660 }; 2620 }
2621
2661 fprintf (tempfile, obstr); 2622 fprintf (tempfile, obstr);
2662 fclose (tempfile); 2623 fclose (tempfile);
2663 2624
2664 op = get_object (); 2625 op = get_object ();
2665 2626
… …
2679 * returns NULL if no match. 2640 * returns NULL if no match.
2680 */ 2641 */
2681object * 2642object *
2682find_obj_by_type_subtype (const object *who, int type, int subtype) 2643find_obj_by_type_subtype (const object *who, int type, int subtype)
2683{ 2644{
2684 object * 2645 object *tmp;
2685 tmp;
2686 2646
2687 for (tmp = who->inv; tmp; tmp = tmp->below) 2647 for (tmp = who->inv; tmp; tmp = tmp->below)
2688 if (tmp->type == type && tmp->subtype == subtype) 2648 if (tmp->type == type && tmp->subtype == subtype)
2689 return tmp; 2649 return tmp;
2690 2650
… …
2698 * do the desired thing. 2658 * do the desired thing.
2699 */ 2659 */
2700key_value * 2660key_value *
2701get_ob_key_link (const object *ob, const char *key) 2661get_ob_key_link (const object *ob, const char *key)
2702{ 2662{
2703 key_value * 2663 key_value *link;
2704 link;
2705 2664
2706 for (link = ob->key_values; link != NULL; link = link->next) 2665 for (link = ob->key_values; link != NULL; link = link->next)
2707 {
2708 if (link->key == key) 2666 if (link->key == key)
2709 {
2710 return link; 2667 return link;
2711 }
2712 }
2713 2668
2714 return NULL; 2669 return NULL;
2715} 2670}
2716 2671
2717/* 2672/*

Diff Legend

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