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.33 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.54 by root, Fri Nov 17 19:40:53 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
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{
254 { 331 {
255 if (inv->inv) 332 if (inv->inv)
256 sum_weight (inv); 333 sum_weight (inv);
257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258 } 335 }
336
259 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
260 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
261 if (op->carrying != sum) 340 if (op->carrying != sum)
262 op->carrying = sum; 341 op->carrying = sum;
342
263 return sum; 343 return sum;
264} 344}
265 345
266/** 346/**
267 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
294 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295 * Some error messages. 375 * Some error messages.
296 * 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.
297 */ 377 */
298 378
299void 379char *
300dump_object2 (object *op)
301{
302 errmsg[0] = 0;
303 return;
304 //TODO//D#d#
305#if 0
306 char *cp;
307
308/* object *tmp;*/
309
310 if (op->arch != NULL)
311 {
312 strcat (errmsg, "arch ");
313 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314 strcat (errmsg, "\n");
315 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316 strcat (errmsg, cp);
317# if 0
318 /* Don't dump player diffs - they are too long, mostly meaningless, and
319 * will overflow the buffer.
320 * Changed so that we don't dump inventory either. This may
321 * also overflow the buffer.
322 */
323 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324 strcat (errmsg, cp);
325 for (tmp = op->inv; tmp; tmp = tmp->below)
326 dump_object2 (tmp);
327# endif
328 strcat (errmsg, "end\n");
329 }
330 else
331 {
332 strcat (errmsg, "Object ");
333 if (op->name == NULL)
334 strcat (errmsg, "(null)");
335 else
336 strcat (errmsg, op->name);
337 strcat (errmsg, "\n");
338# if 0
339 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340 strcat (errmsg, cp);
341 for (tmp = op->inv; tmp; tmp = tmp->below)
342 dump_object2 (tmp);
343# endif
344 strcat (errmsg, "end\n");
345 }
346#endif
347}
348
349/*
350 * Dumps an object. Returns output in the static global errmsg array.
351 */
352
353void
354dump_object (object *op) 380dump_object (object *op)
355{ 381{
356 if (op == NULL) 382 if (!op)
357 { 383 return strdup ("[NULLOBJ]");
358 strcpy (errmsg, "[NULL pointer]");
359 return;
360 }
361 errmsg[0] = '\0';
362 dump_object2 (op);
363}
364 384
365void 385 object_freezer freezer;
366dump_all_objects (void) 386 save_object (freezer, op, 3);
367{ 387 return freezer.as_string ();
368 object *op;
369
370 for (op = objects; op != NULL; op = op->next)
371 {
372 dump_object (op);
373 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374 }
375} 388}
376 389
377/* 390/*
378 * 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
379 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
399 */ 412 */
400 413
401object * 414object *
402find_object (tag_t i) 415find_object (tag_t i)
403{ 416{
404 object *op; 417 for (object *op = object::first; op; op = op->next)
405
406 for (op = objects; op != NULL; op = op->next)
407 if (op->count == i) 418 if (op->count == i)
408 break; 419 return op;
420
409 return op; 421 return 0;
410} 422}
411 423
412/* 424/*
413 * 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.
414 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
416 */ 428 */
417 429
418object * 430object *
419find_object_name (const char *str) 431find_object_name (const char *str)
420{ 432{
421 const char *name = shstr::find (str); 433 shstr_cmp str_ (str);
422 object *op; 434 object *op;
423 435
424 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
425 if (&op->name == name) 437 if (op->name == str_)
426 break; 438 break;
427 439
428 return op; 440 return op;
429} 441}
430 442
431void 443void
432free_all_object_data () 444free_all_object_data ()
433{ 445{
434 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435}
436
437/*
438 * Returns the object which this object marks as being the owner.
439 * A id-scheme is used to avoid pointing to objects which have been
440 * freed and are now reused. If this is detected, the owner is
441 * set to NULL, and NULL is returned.
442 * Changed 2004-02-12 - if the player is setting at the play again
443 * prompt, he is removed, and we don't want to treat him as an owner of
444 * anything, so check removed flag. I don't expect that this should break
445 * anything - once an object is removed, it is basically dead anyways.
446 */
447object *
448object::get_owner ()
449{
450 if (!owner
451 || QUERY_FLAG (owner, FLAG_FREED)
452 || QUERY_FLAG (owner, FLAG_REMOVED))
453 owner = 0;
454
455 return owner;
456} 447}
457 448
458/* 449/*
459 * 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
460 * skill and experience objects. 451 * skill and experience objects.
530 521
531 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
532 523
533 expmul = 1.0; 524 expmul = 1.0;
534 face = blank_face; 525 face = blank_face;
535 attacked_by_count = -1;
536 526
537 if (settings.casting_time) 527 if (settings.casting_time)
538 casting_time = -1; 528 casting_time = -1;
539} 529}
540 530
835 825
836 if (op->more != NULL) 826 if (op->more != NULL)
837 update_object (op->more, action); 827 update_object (op->more, action);
838} 828}
839 829
840static unordered_vector<object *> mortals; 830object::vector object::mortals;
841static std::vector<object *> freed; 831object::vector object::objects; // not yet used
832object *object::first;
842 833
843void object::free_mortals () 834void object::free_mortals ()
844{ 835{
845 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
846 if ((*i)->refcnt) 837 if ((*i)->refcnt)
847 ++i; // further delay freeing 838 ++i; // further delay freeing
848 else 839 else
849 { 840 {
850 freed.push_back (*i);//D
851 //delete *i; 841 delete *i;
852 mortals.erase (i); 842 mortals.erase (i);
853 } 843 }
854 844
855 if (mortals.size())//D 845 static int lastmortals = 0;//D
846
847 if (mortals.size() != lastmortals && lastmortals > 100)//D
848 {
849 lastmortals = mortals.size ();//D
856 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
857} 852}
858 853
859object::object () 854object::object ()
860{ 855{
861 SET_FLAG (this, FLAG_REMOVED); 856 SET_FLAG (this, FLAG_REMOVED);
862 857
863 expmul = 1.0; 858 expmul = 1.0;
864 face = blank_face; 859 face = blank_face;
865 attacked_by_count = -1;
866} 860}
867 861
868object::~object () 862object::~object ()
869{ 863{
870 free_key_values (this); 864 free_key_values (this);
871} 865}
872 866
873void object::link () 867void object::link ()
874{ 868{
875 count = ++ob_count; 869 count = ++ob_count;
870 uuid = gen_uuid ();
876 871
877 prev = 0; 872 prev = 0;
878 next = objects; 873 next = object::first;
879 874
880 if (objects) 875 if (object::first)
881 objects->prev = this; 876 object::first->prev = this;
882 877
883 objects = this; 878 object::first = this;
884} 879}
885 880
886void object::unlink () 881void object::unlink ()
887{ 882{
888 count = 0; 883 if (this == object::first)
884 object::first = next;
889 885
890 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
891 if (prev)
892 {
893 prev->next = next; 887 if (prev) prev->next = next;
888 if (next) next->prev = prev;
889
894 prev = 0; 890 prev = 0;
895 }
896
897 if (next)
898 {
899 next->prev = prev;
900 next = 0; 891 next = 0;
901 }
902
903 if (this == objects)
904 objects = next;
905} 892}
906 893
907object *object::create () 894object *object::create ()
908{ 895{
909 object *op;
910
911 if (freed.empty ())
912 op = new object; 896 object *op = new object;
913 else
914 {
915 // highly annoying, but the only way to get it stable right now
916 op = freed.back ();
917 freed.pop_back ();
918 op->~object ();
919 new ((void *) op) object;
920 }
921
922 op->link (); 897 op->link ();
923 return op; 898 return op;
924} 899}
925 900
926/* 901/*
928 * 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
929 * free objects. The IS_FREED() flag is set in the object. 904 * free objects. The IS_FREED() flag is set in the object.
930 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
931 * this function to succeed. 906 * this function to succeed.
932 * 907 *
933 * 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
934 * inventory to the ground. 909 * inventory to the ground.
935 */ 910 */
936void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
937{ 912{
938 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
939 return; 914 return;
940 915
941 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
946 921
947 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
948 923
949 if (more) 924 if (more)
950 { 925 {
951 more->free (free_inventory); 926 more->destroy (destroy_inventory);
952 more = 0; 927 more = 0;
953 } 928 }
954 929
955 if (inv) 930 if (inv)
956 { 931 {
957 /* Only if the space blocks everything do we not process - 932 /* Only if the space blocks everything do we not process -
958 * if some form of movement is allowed, let objects 933 * if some form of movement is allowed, let objects
959 * drop on that space. 934 * drop on that space.
960 */ 935 */
961 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 936 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962 { 937 {
963 object *op = inv; 938 object *op = inv;
964 939
965 while (op) 940 while (op)
966 { 941 {
967 object *tmp = op->below; 942 object *tmp = op->below;
968 op->free (free_inventory); 943 op->destroy (destroy_inventory);
969 op = tmp; 944 op = tmp;
970 } 945 }
971 } 946 }
972 else 947 else
973 { /* Put objects in inventory onto this space */ 948 { /* Put objects in inventory onto this space */
992 op = tmp; 967 op = tmp;
993 } 968 }
994 } 969 }
995 } 970 }
996 971
972 // clear those pointers that likely might have circular references to us
997 owner = 0; 973 owner = 0;
974 enemy = 0;
975 attacked_by = 0;
976
977 // only relevant for players(?), but make sure of it anyways
978 contr = 0;
998 979
999 /* Remove object from the active list */ 980 /* Remove object from the active list */
1000 speed = 0; 981 speed = 0;
1001 update_ob_speed (this); 982 update_ob_speed (this);
1002 983
1014sub_weight (object *op, signed long weight) 995sub_weight (object *op, signed long weight)
1015{ 996{
1016 while (op != NULL) 997 while (op != NULL)
1017 { 998 {
1018 if (op->type == CONTAINER) 999 if (op->type == CONTAINER)
1019 {
1020 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1000 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021 } 1001
1022 op->carrying -= weight; 1002 op->carrying -= weight;
1023 op = op->env; 1003 op = op->env;
1024 } 1004 }
1025} 1005}
1026 1006
1034 */ 1014 */
1035 1015
1036void 1016void
1037remove_ob (object *op) 1017remove_ob (object *op)
1038{ 1018{
1019 object *tmp, *last = 0;
1039 object * 1020 object *otmp;
1040 tmp, *
1041 last = NULL;
1042 object *
1043 otmp;
1044 1021
1045 tag_t
1046 tag;
1047 int
1048 check_walk_off; 1022 int check_walk_off;
1049 mapstruct * 1023 maptile *m;
1050 m;
1051 1024
1052 sint16 1025 sint16 x, y;
1053 x,
1054 y;
1055 1026
1056 if (QUERY_FLAG (op, FLAG_REMOVED)) 1027 if (QUERY_FLAG (op, FLAG_REMOVED))
1057 return; 1028 return;
1058 1029
1059 SET_FLAG (op, FLAG_REMOVED); 1030 SET_FLAG (op, FLAG_REMOVED);
1136 * use translated coordinates in case some oddness with map tiling is 1107 * use translated coordinates in case some oddness with map tiling is
1137 * evident 1108 * evident
1138 */ 1109 */
1139 if (GET_MAP_OB (m, x, y) != op) 1110 if (GET_MAP_OB (m, x, y) != op)
1140 { 1111 {
1141 dump_object (op); 1112 char *dump = dump_object (op);
1142 LOG (llevError, 1113 LOG (llevError,
1143 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1114 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1115 free (dump);
1144 dump_object (GET_MAP_OB (m, x, y)); 1116 dump = dump_object (GET_MAP_OB (m, x, y));
1145 LOG (llevError, "%s\n", errmsg); 1117 LOG (llevError, "%s\n", dump);
1118 free (dump);
1146 } 1119 }
1147 1120
1148 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1121 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1149 } 1122 }
1150 1123
1152 op->below = 0; 1125 op->below = 0;
1153 1126
1154 if (op->map->in_memory == MAP_SAVING) 1127 if (op->map->in_memory == MAP_SAVING)
1155 return; 1128 return;
1156 1129
1157 tag = op->count;
1158 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1130 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159 1131
1160 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1132 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1161 { 1133 {
1162 /* No point updating the players look faces if he is the object 1134 /* No point updating the players look faces if he is the object
1177 1149
1178 tmp->contr->socket.update_look = 1; 1150 tmp->contr->socket.update_look = 1;
1179 } 1151 }
1180 1152
1181 /* See if player moving off should effect something */ 1153 /* See if player moving off should effect something */
1182 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1154 if (check_walk_off
1155 && ((op->move_type & tmp->move_off)
1156 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183 { 1157 {
1184 move_apply (tmp, op, NULL); 1158 move_apply (tmp, op, NULL);
1185 1159
1186 if (was_destroyed (op, tag)) 1160 if (op->destroyed ())
1187 {
1188 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189 }
1190 } 1162 }
1191 1163
1192 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1164 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193 1165
1194 if (tmp->above == tmp) 1166 if (tmp->above == tmp)
1222 * This function goes through all objects below and including top, and 1194 * This function goes through all objects below and including top, and
1223 * merges op to the first matching object. 1195 * merges op to the first matching object.
1224 * If top is NULL, it is calculated. 1196 * If top is NULL, it is calculated.
1225 * Returns pointer to object if it succeded in the merge, otherwise NULL 1197 * Returns pointer to object if it succeded in the merge, otherwise NULL
1226 */ 1198 */
1227
1228object * 1199object *
1229merge_ob (object *op, object *top) 1200merge_ob (object *op, object *top)
1230{ 1201{
1231 if (!op->nrof) 1202 if (!op->nrof)
1232 return 0; 1203 return 0;
1248 free_object (op); 1219 free_object (op);
1249 return top; 1220 return top;
1250 } 1221 }
1251 } 1222 }
1252 1223
1253 return NULL; 1224 return 0;
1254} 1225}
1255 1226
1256/* 1227/*
1257 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1228 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1258 * job preparing multi-part monsters 1229 * job preparing multi-part monsters
1259 */ 1230 */
1260object * 1231object *
1261insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1232insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262{ 1233{
1263 object *tmp; 1234 object *tmp;
1264 1235
1265 if (op->head) 1236 if (op->head)
1266 op = op->head; 1237 op = op->head;
1294 * NULL if 'op' was destroyed 1265 * NULL if 'op' was destroyed
1295 * just 'op' otherwise 1266 * just 'op' otherwise
1296 */ 1267 */
1297 1268
1298object * 1269object *
1299insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1270insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300{ 1271{
1301 object *tmp, *top, *floor = NULL; 1272 object *tmp, *top, *floor = NULL;
1302 sint16 x, y; 1273 sint16 x, y;
1303 1274
1304 if (QUERY_FLAG (op, FLAG_FREED)) 1275 if (QUERY_FLAG (op, FLAG_FREED))
1307 return NULL; 1278 return NULL;
1308 } 1279 }
1309 1280
1310 if (m == NULL) 1281 if (m == NULL)
1311 { 1282 {
1312 dump_object (op); 1283 char *dump = dump_object (op);
1313 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1284 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1285 free (dump);
1314 return op; 1286 return op;
1315 } 1287 }
1316 1288
1317 if (out_of_map (m, op->x, op->y)) 1289 if (out_of_map (m, op->x, op->y))
1318 { 1290 {
1319 dump_object (op); 1291 char *dump = dump_object (op);
1320 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1292 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321#ifdef MANY_CORES 1293#ifdef MANY_CORES
1322 /* Better to catch this here, as otherwise the next use of this object 1294 /* Better to catch this here, as otherwise the next use of this object
1323 * is likely to cause a crash. Better to find out where it is getting 1295 * is likely to cause a crash. Better to find out where it is getting
1324 * improperly inserted. 1296 * improperly inserted.
1325 */ 1297 */
1326 abort (); 1298 abort ();
1327#endif 1299#endif
1300 free (dump);
1328 return op; 1301 return op;
1329 } 1302 }
1330 1303
1331 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1304 if (!QUERY_FLAG (op, FLAG_REMOVED))
1332 { 1305 {
1333 dump_object (op); 1306 char *dump = dump_object (op);
1334 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1307 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1308 free (dump);
1335 return op; 1309 return op;
1336 } 1310 }
1337 1311
1338 if (op->more != NULL) 1312 if (op->more != NULL)
1339 { 1313 {
1585 remove_ob (tmp); 1559 remove_ob (tmp);
1586 free_object (tmp); 1560 free_object (tmp);
1587 } 1561 }
1588 } 1562 }
1589 1563
1590 tmp1 = arch_to_object (find_archetype (arch_string)); 1564 tmp1 = arch_to_object (archetype::find (arch_string));
1591 1565
1592 tmp1->x = op->x; 1566 tmp1->x = op->x;
1593 tmp1->y = op->y; 1567 tmp1->y = op->y;
1594 insert_ob_in_map (tmp1, op->map, op, 0); 1568 insert_ob_in_map (tmp1, op->map, op, 0);
1595} 1569}
1776 tmp, * 1750 tmp, *
1777 otmp; 1751 otmp;
1778 1752
1779 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1753 if (!QUERY_FLAG (op, FLAG_REMOVED))
1780 { 1754 {
1781 dump_object (op); 1755 char *dump = dump_object (op);
1782 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1756 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1757 free (dump);
1783 return op; 1758 return op;
1784 } 1759 }
1785 1760
1786 if (where == NULL) 1761 if (where == NULL)
1787 { 1762 {
1788 dump_object (op); 1763 char *dump = dump_object (op);
1789 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1764 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1765 free (dump);
1790 return op; 1766 return op;
1791 } 1767 }
1792 1768
1793 if (where->head) 1769 if (where->head)
1794 { 1770 {
1894 */ 1870 */
1895 1871
1896int 1872int
1897check_move_on (object *op, object *originator) 1873check_move_on (object *op, object *originator)
1898{ 1874{
1899 object * 1875 object *tmp;
1900 tmp; 1876 maptile *m = op->map;
1901 tag_t
1902 tag;
1903 mapstruct *
1904 m = op->map;
1905 int
1906 x = op->x, y = op->y; 1877 int x = op->x, y = op->y;
1907 1878
1908 MoveType 1879 MoveType move_on, move_slow, move_block;
1909 move_on,
1910 move_slow,
1911 move_block;
1912 1880
1913 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1881 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914 return 0; 1882 return 0;
1915
1916 tag = op->count;
1917 1883
1918 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1884 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1885 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1886 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921 1887
1982 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1948 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1949 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984 { 1950 {
1985 move_apply (tmp, op, originator); 1951 move_apply (tmp, op, originator);
1986 1952
1987 if (was_destroyed (op, tag)) 1953 if (op->destroyed ())
1988 return 1; 1954 return 1;
1989 1955
1990 /* what the person/creature stepped onto has moved the object 1956 /* what the person/creature stepped onto has moved the object
1991 * someplace new. Don't process any further - if we did, 1957 * someplace new. Don't process any further - if we did,
1992 * have a feeling strange problems would result. 1958 * have a feeling strange problems would result.
2004 * a matching archetype at the given map and coordinates. 1970 * a matching archetype at the given map and coordinates.
2005 * The first matching object is returned, or NULL if none. 1971 * The first matching object is returned, or NULL if none.
2006 */ 1972 */
2007 1973
2008object * 1974object *
2009present_arch (const archetype *at, mapstruct *m, int x, int y) 1975present_arch (const archetype *at, maptile *m, int x, int y)
2010{ 1976{
2011 object * 1977 object *
2012 tmp; 1978 tmp;
2013 1979
2014 if (m == NULL || out_of_map (m, x, y)) 1980 if (m == NULL || out_of_map (m, x, y))
2027 * a matching type variable at the given map and coordinates. 1993 * a matching type variable at the given map and coordinates.
2028 * The first matching object is returned, or NULL if none. 1994 * The first matching object is returned, or NULL if none.
2029 */ 1995 */
2030 1996
2031object * 1997object *
2032present (unsigned char type, mapstruct *m, int x, int y) 1998present (unsigned char type, maptile *m, int x, int y)
2033{ 1999{
2034 object * 2000 object *
2035 tmp; 2001 tmp;
2036 2002
2037 if (out_of_map (m, x, y)) 2003 if (out_of_map (m, x, y))
2177 * the archetype because that isn't correct if the monster has been 2143 * the archetype because that isn't correct if the monster has been
2178 * customized, changed states, etc. 2144 * customized, changed states, etc.
2179 */ 2145 */
2180 2146
2181int 2147int
2182find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2148find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183{ 2149{
2184 int 2150 int
2185 i, 2151 i,
2186 index = 0, flag; 2152 index = 0, flag;
2187 static int 2153 static int
2208 return -1; 2174 return -1;
2209 return altern[RANDOM () % index]; 2175 return altern[RANDOM () % index];
2210} 2176}
2211 2177
2212/* 2178/*
2213 * find_first_free_spot(archetype, mapstruct, x, y) works like 2179 * find_first_free_spot(archetype, maptile, x, y) works like
2214 * find_free_spot(), but it will search max number of squares. 2180 * find_free_spot(), but it will search max number of squares.
2215 * But it will return the first available spot, not a random choice. 2181 * But it will return the first available spot, not a random choice.
2216 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2182 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2217 */ 2183 */
2218 2184
2219int 2185int
2220find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2186find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221{ 2187{
2222 int 2188 int
2223 i; 2189 i;
2224 2190
2225 for (i = 0; i < SIZEOFFREE; i++) 2191 for (i = 0; i < SIZEOFFREE; i++)
2289 * because we have to know what movement the thing looking to move 2255 * because we have to know what movement the thing looking to move
2290 * there is capable of. 2256 * there is capable of.
2291 */ 2257 */
2292 2258
2293int 2259int
2294find_dir (mapstruct *m, int x, int y, object *exclude) 2260find_dir (maptile *m, int x, int y, object *exclude)
2295{ 2261{
2296 int 2262 int
2297 i, 2263 i,
2298 max = SIZEOFFREE, mflags; 2264 max = SIZEOFFREE, mflags;
2299 2265
2300 sint16 nx, ny; 2266 sint16 nx, ny;
2301 object * 2267 object *
2302 tmp; 2268 tmp;
2303 mapstruct * 2269 maptile *
2304 mp; 2270 mp;
2305 2271
2306 MoveType blocked, move_type; 2272 MoveType blocked, move_type;
2307 2273
2308 if (exclude && exclude->head) 2274 if (exclude && exclude->head)
2516 * Modified to be map tile aware -.MSW 2482 * Modified to be map tile aware -.MSW
2517 */ 2483 */
2518 2484
2519 2485
2520int 2486int
2521can_see_monsterP (mapstruct *m, int x, int y, int dir) 2487can_see_monsterP (maptile *m, int x, int y, int dir)
2522{ 2488{
2523 sint16 dx, dy; 2489 sint16 dx, dy;
2524 int 2490 int
2525 mflags; 2491 mflags;
2526 2492
2606 if (prev) 2572 if (prev)
2607 prev->more = tmp; 2573 prev->more = tmp;
2608 prev = tmp; 2574 prev = tmp;
2609 } 2575 }
2610 2576
2611 /*** copy inventory ***/
2612 for (item = src->inv; item; item = item->below) 2577 for (item = src->inv; item; item = item->below)
2613 {
2614 (void) insert_ob_in_ob (object_create_clone (item), dst); 2578 insert_ob_in_ob (object_create_clone (item), dst);
2615 }
2616 2579
2617 return dst; 2580 return dst;
2618} 2581}
2619 2582
2620/* return true if the object was destroyed, 0 otherwise */
2621int
2622was_destroyed (const object *op, tag_t old_tag)
2623{
2624 /* checking for FLAG_FREED isn't necessary, but makes this function more
2625 * robust */
2626 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627}
2628
2629/* GROS - Creates an object using a string representing its content. */ 2583/* GROS - Creates an object using a string representing its content. */
2630
2631/* Basically, we save the content of the string to a temp file, then call */ 2584/* Basically, we save the content of the string to a temp file, then call */
2632
2633/* load_object on it. I admit it is a highly inefficient way to make things, */ 2585/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635/* but it was simple to make and allows reusing the load_object function. */ 2586/* but it was simple to make and allows reusing the load_object function. */
2636
2637/* Remember not to use load_object_str in a time-critical situation. */ 2587/* Remember not to use load_object_str in a time-critical situation. */
2638
2639/* Also remember that multiparts objects are not supported for now. */ 2588/* Also remember that multiparts objects are not supported for now. */
2640 2589
2641object * 2590object *
2642load_object_str (const char *obstr) 2591load_object_str (const char *obstr)
2643{ 2592{
2644 object * 2593 object *op;
2645 op;
2646 char
2647 filename[MAX_BUF]; 2594 char filename[MAX_BUF];
2648 2595
2649 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2596 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650 2597
2651 FILE *
2652 tempfile = fopen (filename, "w"); 2598 FILE *tempfile = fopen (filename, "w");
2653 2599
2654 if (tempfile == NULL) 2600 if (tempfile == NULL)
2655 { 2601 {
2656 LOG (llevError, "Error - Unable to access load object temp file\n"); 2602 LOG (llevError, "Error - Unable to access load object temp file\n");
2657 return NULL; 2603 return NULL;
2658 }; 2604 }
2605
2659 fprintf (tempfile, obstr); 2606 fprintf (tempfile, obstr);
2660 fclose (tempfile); 2607 fclose (tempfile);
2661 2608
2662 op = get_object (); 2609 op = get_object ();
2663 2610
2677 * returns NULL if no match. 2624 * returns NULL if no match.
2678 */ 2625 */
2679object * 2626object *
2680find_obj_by_type_subtype (const object *who, int type, int subtype) 2627find_obj_by_type_subtype (const object *who, int type, int subtype)
2681{ 2628{
2682 object * 2629 object *tmp;
2683 tmp;
2684 2630
2685 for (tmp = who->inv; tmp; tmp = tmp->below) 2631 for (tmp = who->inv; tmp; tmp = tmp->below)
2686 if (tmp->type == type && tmp->subtype == subtype) 2632 if (tmp->type == type && tmp->subtype == subtype)
2687 return tmp; 2633 return tmp;
2688 2634
2696 * do the desired thing. 2642 * do the desired thing.
2697 */ 2643 */
2698key_value * 2644key_value *
2699get_ob_key_link (const object *ob, const char *key) 2645get_ob_key_link (const object *ob, const char *key)
2700{ 2646{
2701 key_value * 2647 key_value *link;
2702 link;
2703 2648
2704 for (link = ob->key_values; link != NULL; link = link->next) 2649 for (link = ob->key_values; link != NULL; link = link->next)
2705 {
2706 if (link->key == key) 2650 if (link->key == key)
2707 {
2708 return link; 2651 return link;
2709 }
2710 }
2711 2652
2712 return NULL; 2653 return NULL;
2713} 2654}
2714 2655
2715/* 2656/*
2720 * The returned string is shared. 2661 * The returned string is shared.
2721 */ 2662 */
2722const char * 2663const char *
2723get_ob_key_value (const object *op, const char *const key) 2664get_ob_key_value (const object *op, const char *const key)
2724{ 2665{
2725 key_value * 2666 key_value *link;
2726 link; 2667 shstr_cmp canonical_key (key);
2727 const char *
2728 canonical_key;
2729 2668
2730 canonical_key = shstr::find (key);
2731
2732 if (canonical_key == NULL) 2669 if (!canonical_key)
2733 { 2670 {
2734 /* 1. There being a field named key on any object 2671 /* 1. There being a field named key on any object
2735 * implies there'd be a shared string to find. 2672 * implies there'd be a shared string to find.
2736 * 2. Since there isn't, no object has this field. 2673 * 2. Since there isn't, no object has this field.
2737 * 3. Therefore, *this* object doesn't have this field. 2674 * 3. Therefore, *this* object doesn't have this field.
2738 */ 2675 */
2739 return NULL; 2676 return 0;
2740 } 2677 }
2741 2678
2742 /* This is copied from get_ob_key_link() above - 2679 /* This is copied from get_ob_key_link() above -
2743 * only 4 lines, and saves the function call overhead. 2680 * only 4 lines, and saves the function call overhead.
2744 */ 2681 */
2745 for (link = op->key_values; link != NULL; link = link->next) 2682 for (link = op->key_values; link; link = link->next)
2746 {
2747 if (link->key == canonical_key) 2683 if (link->key == canonical_key)
2748 {
2749 return link->value; 2684 return link->value;
2750 } 2685
2751 }
2752 return NULL; 2686 return 0;
2753} 2687}
2754 2688
2755 2689
2756/* 2690/*
2757 * Updates the canonical_key in op to value. 2691 * Updates the canonical_key in op to value.
2843 shstr key_ (key); 2777 shstr key_ (key);
2844 2778
2845 return set_ob_key_value_s (op, key_, value, add_key); 2779 return set_ob_key_value_s (op, key_, value, add_key);
2846} 2780}
2847 2781
2782object::depth_iterator::depth_iterator (object *container)
2783: iterator_base (container)
2784{
2785 while (item->inv)
2786 item = item->inv;
2787}
2788
2848void 2789void
2849object::deep_iterator::next () 2790object::depth_iterator::next ()
2850{ 2791{
2851 if (item->inv)
2852 item = item->inv;
2853 else if (item->below) 2792 if (item->below)
2793 {
2854 item = item->below; 2794 item = item->below;
2795
2796 while (item->inv)
2797 item = item->inv;
2798 }
2855 else 2799 else
2856 item = item->env->below; 2800 item = item->env;
2857} 2801}
2802
2803// return a suitable string describing an objetc in enough detail to find it
2804const char *
2805object::debug_desc (char *info) const
2806{
2807 char info2[256 * 3];
2808 char *p = info;
2809
2810 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2811 count,
2812 &name,
2813 title ? " " : "",
2814 title ? (const char *)title : "");
2815
2816 if (env)
2817 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2818
2819 if (map)
2820 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2821
2822 return info;
2823}
2824
2825const char *
2826object::debug_desc () const
2827{
2828 static char info[256 * 3];
2829 return debug_desc (info);
2830}
2831

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines