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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.57 by root, Sun Dec 3 02:46: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. */
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h>
35#include <loader.h> 33#include <loader.h>
36 34
37int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
38 38
39object *objects; /* Pointer to the list of used objects */
40object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
41 40
42short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44}; 43};
50}; 49};
51int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 53};
54
55static void
56write_uuid (void)
57{
58 char filename1[MAX_BUF], filename2[MAX_BUF];
59
60 sprintf (filename1, "%s/uuid", settings.localdir);
61 sprintf (filename2, "%s/uuid~", settings.localdir);
62
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74}
75
76static void
77read_uuid (void)
78{
79 char filename[MAX_BUF];
80
81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 FILE *fp;
84
85 if (!(fp = fopen (filename, "r")))
86 {
87 if (errno == ENOENT)
88 {
89 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0;
91 write_uuid ();
92 return;
93 }
94
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1);
97 }
98
99 int version;
100 unsigned long long uid;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
102 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
104 _exit (1);
105 }
106
107 uuid.seq = uid;
108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid);
110 fclose (fp);
111}
112
113UUID
114gen_uuid ()
115{
116 UUID uid;
117
118 uid.seq = ++uuid.seq;
119
120 if (!(uuid.seq & (UUID_SKIP - 1)))
121 write_uuid ();
122
123 return uid;
124}
125
126void
127init_uuid ()
128{
129 read_uuid ();
130}
55 131
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 133static int
58compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
59{ 135{
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
295 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
296 * Some error messages. 375 * Some error messages.
297 * 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.
298 */ 377 */
299 378
300void 379char *
301dump_object2 (object *op)
302{
303 errmsg[0] = 0;
304 return;
305 //TODO//D#d#
306#if 0
307 char *cp;
308
309/* object *tmp;*/
310
311 if (op->arch != NULL)
312 {
313 strcat (errmsg, "arch ");
314 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
315 strcat (errmsg, "\n");
316 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
317 strcat (errmsg, cp);
318# if 0
319 /* Don't dump player diffs - they are too long, mostly meaningless, and
320 * will overflow the buffer.
321 * Changed so that we don't dump inventory either. This may
322 * also overflow the buffer.
323 */
324 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
325 strcat (errmsg, cp);
326 for (tmp = op->inv; tmp; tmp = tmp->below)
327 dump_object2 (tmp);
328# endif
329 strcat (errmsg, "end\n");
330 }
331 else
332 {
333 strcat (errmsg, "Object ");
334 if (op->name == NULL)
335 strcat (errmsg, "(null)");
336 else
337 strcat (errmsg, op->name);
338 strcat (errmsg, "\n");
339# if 0
340 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
341 strcat (errmsg, cp);
342 for (tmp = op->inv; tmp; tmp = tmp->below)
343 dump_object2 (tmp);
344# endif
345 strcat (errmsg, "end\n");
346 }
347#endif
348}
349
350/*
351 * Dumps an object. Returns output in the static global errmsg array.
352 */
353
354void
355dump_object (object *op) 380dump_object (object *op)
356{ 381{
357 if (op == NULL) 382 if (!op)
358 { 383 return strdup ("[NULLOBJ]");
359 strcpy (errmsg, "[NULL pointer]");
360 return;
361 }
362 errmsg[0] = '\0';
363 dump_object2 (op);
364}
365 384
366void 385 object_freezer freezer;
367dump_all_objects (void) 386 save_object (freezer, op, 3);
368{ 387 return freezer.as_string ();
369 object *op;
370
371 for (op = objects; op != NULL; op = op->next)
372 {
373 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
375 }
376} 388}
377 389
378/* 390/*
379 * 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
380 * multi-object 1 which is closest to the second object. 392 * multi-object 1 which is closest to the second object.
400 */ 412 */
401 413
402object * 414object *
403find_object (tag_t i) 415find_object (tag_t i)
404{ 416{
405 object *op; 417 for (object *op = object::first; op; op = op->next)
406
407 for (op = objects; op != NULL; op = op->next)
408 if (op->count == i) 418 if (op->count == i)
409 break; 419 return op;
420
410 return op; 421 return 0;
411} 422}
412 423
413/* 424/*
414 * 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.
415 * Used only by the patch command, but not all that useful. 426 * Used only by the patch command, but not all that useful.
417 */ 428 */
418 429
419object * 430object *
420find_object_name (const char *str) 431find_object_name (const char *str)
421{ 432{
422 const char *name = shstr::find (str); 433 shstr_cmp str_ (str);
423 object *op; 434 object *op;
424 435
425 for (op = objects; op != NULL; op = op->next) 436 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 437 if (op->name == str_)
427 break; 438 break;
428 439
429 return op; 440 return op;
430} 441}
431 442
432void 443void
433free_all_object_data () 444free_all_object_data ()
434{ 445{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 446 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436}
437
438/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448object *
449object::get_owner ()
450{
451 if (!owner
452 || QUERY_FLAG (owner, FLAG_FREED)
453 || QUERY_FLAG (owner, FLAG_REMOVED))
454 owner = 0;
455
456 return owner;
457} 447}
458 448
459/* 449/*
460 * 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
461 * skill and experience objects. 451 * skill and experience objects.
531 521
532 /* What is not cleared is next, prev, and count */ 522 /* What is not cleared is next, prev, and count */
533 523
534 expmul = 1.0; 524 expmul = 1.0;
535 face = blank_face; 525 face = blank_face;
536 attacked_by_count = -1;
537 526
538 if (settings.casting_time) 527 if (settings.casting_time)
539 casting_time = -1; 528 casting_time = -1;
540} 529}
541 530
623/* 612/*
624 * Updates the speed of an object. If the speed changes from 0 to another 613 * Updates the speed of an object. If the speed changes from 0 to another
625 * value, or vice versa, then add/remove the object from the active list. 614 * value, or vice versa, then add/remove the object from the active list.
626 * This function needs to be called whenever the speed of an object changes. 615 * This function needs to be called whenever the speed of an object changes.
627 */ 616 */
628
629void 617void
630update_ob_speed (object *op) 618update_ob_speed (object *op)
631{ 619{
632 extern int arch_init; 620 extern int arch_init;
633 621
642 abort (); 630 abort ();
643#else 631#else
644 op->speed = 0; 632 op->speed = 0;
645#endif 633#endif
646 } 634 }
635
647 if (arch_init) 636 if (arch_init)
648 {
649 return; 637 return;
650 } 638
651 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 639 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
652 { 640 {
653 /* If already on active list, don't do anything */ 641 /* If already on active list, don't do anything */
654 if (op->active_next || op->active_prev || op == active_objects) 642 if (op->active_next || op->active_prev || op == active_objects)
655 return; 643 return;
656 644
657 /* process_events() expects us to insert the object at the beginning 645 /* process_events() expects us to insert the object at the beginning
658 * of the list. */ 646 * of the list. */
659 op->active_next = active_objects; 647 op->active_next = active_objects;
648
660 if (op->active_next != NULL) 649 if (op->active_next != NULL)
661 op->active_next->active_prev = op; 650 op->active_next->active_prev = op;
651
662 active_objects = op; 652 active_objects = op;
663 } 653 }
664 else 654 else
665 { 655 {
666 /* If not on the active list, nothing needs to be done */ 656 /* If not on the active list, nothing needs to be done */
668 return; 658 return;
669 659
670 if (op->active_prev == NULL) 660 if (op->active_prev == NULL)
671 { 661 {
672 active_objects = op->active_next; 662 active_objects = op->active_next;
663
673 if (op->active_next != NULL) 664 if (op->active_next != NULL)
674 op->active_next->active_prev = NULL; 665 op->active_next->active_prev = NULL;
675 } 666 }
676 else 667 else
677 { 668 {
678 op->active_prev->active_next = op->active_next; 669 op->active_prev->active_next = op->active_next;
670
679 if (op->active_next) 671 if (op->active_next)
680 op->active_next->active_prev = op->active_prev; 672 op->active_next->active_prev = op->active_prev;
681 } 673 }
674
682 op->active_next = NULL; 675 op->active_next = NULL;
683 op->active_prev = NULL; 676 op->active_prev = NULL;
684 } 677 }
685} 678}
686 679
832 825
833 if (op->more != NULL) 826 if (op->more != NULL)
834 update_object (op->more, action); 827 update_object (op->more, action);
835} 828}
836 829
837static unordered_vector<object *> mortals; 830object::vector object::mortals;
838static std::vector<object *> freed; 831object::vector object::objects; // not yet used
832object *object::first;
839 833
840void object::free_mortals () 834void object::free_mortals ()
841{ 835{
842 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 836 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
843 if ((*i)->refcnt) 837 if ((*i)->refcnt)
844 ++i; // further delay freeing 838 ++i; // further delay freeing
845 else 839 else
846 { 840 {
847 freed.push_back (*i);//D
848 //delete *i; 841 delete *i;
849 mortals.erase (i); 842 mortals.erase (i);
850 } 843 }
851 844
852 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
853 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D 850 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851 }
854} 852}
855 853
856object::object () 854object::object ()
857{ 855{
858 SET_FLAG (this, FLAG_REMOVED); 856 SET_FLAG (this, FLAG_REMOVED);
859 857
860 expmul = 1.0; 858 expmul = 1.0;
861 face = blank_face; 859 face = blank_face;
862 attacked_by_count = -1;
863} 860}
864 861
865object::~object () 862object::~object ()
866{ 863{
867 free_key_values (this); 864 free_key_values (this);
868} 865}
869 866
870void object::link () 867void object::link ()
871{ 868{
872 count = ++ob_count; 869 count = ++ob_count;
870 uuid = gen_uuid ();
873 871
874 prev = 0; 872 prev = 0;
875 next = objects; 873 next = object::first;
876 874
877 if (objects) 875 if (object::first)
878 objects->prev = this; 876 object::first->prev = this;
879 877
880 objects = this; 878 object::first = this;
881} 879}
882 880
883void object::unlink () 881void object::unlink ()
884{ 882{
885 count = 0; 883 if (this == object::first)
884 object::first = next;
886 885
887 /* Remove this object from the list of used objects */ 886 /* Remove this object from the list of used objects */
888 if (prev)
889 {
890 prev->next = next; 887 if (prev) prev->next = next;
888 if (next) next->prev = prev;
889
891 prev = 0; 890 prev = 0;
892 }
893
894 if (next)
895 {
896 next->prev = prev;
897 next = 0; 891 next = 0;
898 }
899
900 if (this == objects)
901 objects = next;
902} 892}
903 893
904object *object::create () 894object *object::create ()
905{ 895{
906 object *
907 op;
908
909 if (freed.empty ())
910 op = new object; 896 object *op = new object;
911 else
912 {
913 // highly annoying, but the only way to get it stable right now
914 op = freed.back ();
915 freed.pop_back ();
916 op->~object ();
917 new ((void *) op) object;
918 }
919
920 op->link (); 897 op->link ();
921 return op; 898 return op;
922} 899}
923 900
924/* 901/*
926 * 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
927 * free objects. The IS_FREED() flag is set in the object. 904 * free objects. The IS_FREED() flag is set in the object.
928 * The object must have been removed by remove_ob() first for 905 * The object must have been removed by remove_ob() first for
929 * this function to succeed. 906 * this function to succeed.
930 * 907 *
931 * 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
932 * inventory to the ground. 909 * inventory to the ground.
933 */ 910 */
934void object::free (bool free_inventory) 911void object::destroy (bool destroy_inventory)
935{ 912{
936 if (QUERY_FLAG (this, FLAG_FREED)) 913 if (QUERY_FLAG (this, FLAG_FREED))
937 return; 914 return;
938 915
916 if (QUERY_FLAG (this, FLAG_FRIENDLY))
917 remove_friendly_object (this);
918
939 if (!QUERY_FLAG (this, FLAG_REMOVED)) 919 if (!QUERY_FLAG (this, FLAG_REMOVED))
940 remove_ob (this); 920 remove_ob (this);
941 921
942 if (QUERY_FLAG (this, FLAG_FRIENDLY))
943 remove_friendly_object (this);
944
945 SET_FLAG (this, FLAG_FREED); 922 SET_FLAG (this, FLAG_FREED);
946 923
947 if (more) 924 if (more)
948 { 925 {
949 more->free (free_inventory); 926 more->destroy (destroy_inventory);
950 more = 0; 927 more = 0;
951 } 928 }
952 929
953 if (inv) 930 if (inv)
954 { 931 {
955 /* Only if the space blocks everything do we not process - 932 /* Only if the space blocks everything do we not process -
956 * if some form of movement is allowed, let objects 933 * if some form of movement is allowed, let objects
957 * drop on that space. 934 * drop on that space.
958 */ 935 */
959 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)
960 { 937 {
961 object *op = inv; 938 object *op = inv;
962 939
963 while (op) 940 while (op)
964 { 941 {
965 object *tmp = op->below; 942 object *tmp = op->below;
966 op->free (free_inventory); 943 op->destroy (destroy_inventory);
967 op = tmp; 944 op = tmp;
968 } 945 }
969 } 946 }
970 else 947 else
971 { /* Put objects in inventory onto this space */ 948 { /* Put objects in inventory onto this space */
990 op = tmp; 967 op = tmp;
991 } 968 }
992 } 969 }
993 } 970 }
994 971
972 // hack to ensure that freed objects still have a valid map
973 {
974 static maptile *freed_map; // freed objects are moved here to avoid crashes
975
976 if (!freed_map)
977 {
978 freed_map = new maptile;
979
980 freed_map->name = "/internal/freed_objects_map";
981 freed_map->width = 3;
982 freed_map->height = 3;
983
984 freed_map->allocate ();
985 }
986
987 map = freed_map;
988 x = 1;
989 y = 1;
990 }
991
992 // clear those pointers that likely might have circular references to us
995 owner = 0; 993 owner = 0;
994 enemy = 0;
995 attacked_by = 0;
996
997 // only relevant for players(?), but make sure of it anyways
998 contr = 0;
996 999
997 /* Remove object from the active list */ 1000 /* Remove object from the active list */
998 speed = 0; 1001 speed = 0;
999 update_ob_speed (this); 1002 update_ob_speed (this);
1000 1003
1012sub_weight (object *op, signed long weight) 1015sub_weight (object *op, signed long weight)
1013{ 1016{
1014 while (op != NULL) 1017 while (op != NULL)
1015 { 1018 {
1016 if (op->type == CONTAINER) 1019 if (op->type == CONTAINER)
1017 {
1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1020 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1019 } 1021
1020 op->carrying -= weight; 1022 op->carrying -= weight;
1021 op = op->env; 1023 op = op->env;
1022 } 1024 }
1023} 1025}
1024 1026
1032 */ 1034 */
1033 1035
1034void 1036void
1035remove_ob (object *op) 1037remove_ob (object *op)
1036{ 1038{
1039 object *tmp, *last = 0;
1037 object * 1040 object *otmp;
1038 tmp, *
1039 last = NULL;
1040 object *
1041 otmp;
1042 1041
1043 tag_t
1044 tag;
1045 int
1046 check_walk_off; 1042 int check_walk_off;
1047 mapstruct * 1043 maptile *m;
1048 m;
1049 1044
1050 sint16 1045 sint16 x, y;
1051 x,
1052 y;
1053 1046
1054 if (QUERY_FLAG (op, FLAG_REMOVED)) 1047 if (QUERY_FLAG (op, FLAG_REMOVED))
1055 return; 1048 return;
1056 1049
1057 SET_FLAG (op, FLAG_REMOVED); 1050 SET_FLAG (op, FLAG_REMOVED);
1134 * use translated coordinates in case some oddness with map tiling is 1127 * use translated coordinates in case some oddness with map tiling is
1135 * evident 1128 * evident
1136 */ 1129 */
1137 if (GET_MAP_OB (m, x, y) != op) 1130 if (GET_MAP_OB (m, x, y) != op)
1138 { 1131 {
1139 dump_object (op); 1132 char *dump = dump_object (op);
1140 LOG (llevError, 1133 LOG (llevError,
1141 "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); 1134 "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);
1135 free (dump);
1142 dump_object (GET_MAP_OB (m, x, y)); 1136 dump = dump_object (GET_MAP_OB (m, x, y));
1143 LOG (llevError, "%s\n", errmsg); 1137 LOG (llevError, "%s\n", dump);
1138 free (dump);
1144 } 1139 }
1145 1140
1146 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1141 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1147 } 1142 }
1148 1143
1150 op->below = 0; 1145 op->below = 0;
1151 1146
1152 if (op->map->in_memory == MAP_SAVING) 1147 if (op->map->in_memory == MAP_SAVING)
1153 return; 1148 return;
1154 1149
1155 tag = op->count;
1156 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1150 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1157 1151
1158 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1152 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1159 { 1153 {
1160 /* No point updating the players look faces if he is the object 1154 /* No point updating the players look faces if he is the object
1175 1169
1176 tmp->contr->socket.update_look = 1; 1170 tmp->contr->socket.update_look = 1;
1177 } 1171 }
1178 1172
1179 /* See if player moving off should effect something */ 1173 /* See if player moving off should effect something */
1180 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1174 if (check_walk_off
1175 && ((op->move_type & tmp->move_off)
1176 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1181 { 1177 {
1182 move_apply (tmp, op, NULL); 1178 move_apply (tmp, op, NULL);
1183 1179
1184 if (was_destroyed (op, tag)) 1180 if (op->destroyed ())
1185 {
1186 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1181 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1187 }
1188 } 1182 }
1189 1183
1190 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1184 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1191 1185
1192 if (tmp->above == tmp) 1186 if (tmp->above == tmp)
1220 * This function goes through all objects below and including top, and 1214 * This function goes through all objects below and including top, and
1221 * merges op to the first matching object. 1215 * merges op to the first matching object.
1222 * If top is NULL, it is calculated. 1216 * If top is NULL, it is calculated.
1223 * Returns pointer to object if it succeded in the merge, otherwise NULL 1217 * Returns pointer to object if it succeded in the merge, otherwise NULL
1224 */ 1218 */
1225
1226object * 1219object *
1227merge_ob (object *op, object *top) 1220merge_ob (object *op, object *top)
1228{ 1221{
1229 if (!op->nrof) 1222 if (!op->nrof)
1230 return 0; 1223 return 0;
1246 free_object (op); 1239 free_object (op);
1247 return top; 1240 return top;
1248 } 1241 }
1249 } 1242 }
1250 1243
1251 return NULL; 1244 return 0;
1252} 1245}
1253 1246
1254/* 1247/*
1255 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1248 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1256 * job preparing multi-part monsters 1249 * job preparing multi-part monsters
1257 */ 1250 */
1258object * 1251object *
1259insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1252insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1260{ 1253{
1261 object *tmp; 1254 object *tmp;
1262 1255
1263 if (op->head) 1256 if (op->head)
1264 op = op->head; 1257 op = op->head;
1292 * NULL if 'op' was destroyed 1285 * NULL if 'op' was destroyed
1293 * just 'op' otherwise 1286 * just 'op' otherwise
1294 */ 1287 */
1295 1288
1296object * 1289object *
1297insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1290insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1298{ 1291{
1299 object *tmp, *top, *floor = NULL; 1292 object *tmp, *top, *floor = NULL;
1300 sint16 x, y; 1293 sint16 x, y;
1301 1294
1302 if (QUERY_FLAG (op, FLAG_FREED)) 1295 if (QUERY_FLAG (op, FLAG_FREED))
1305 return NULL; 1298 return NULL;
1306 } 1299 }
1307 1300
1308 if (m == NULL) 1301 if (m == NULL)
1309 { 1302 {
1310 dump_object (op); 1303 char *dump = dump_object (op);
1311 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1304 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1305 free (dump);
1312 return op; 1306 return op;
1313 } 1307 }
1314 1308
1315 if (out_of_map (m, op->x, op->y)) 1309 if (out_of_map (m, op->x, op->y))
1316 { 1310 {
1317 dump_object (op); 1311 char *dump = dump_object (op);
1318 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1312 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1319#ifdef MANY_CORES 1313#ifdef MANY_CORES
1320 /* Better to catch this here, as otherwise the next use of this object 1314 /* Better to catch this here, as otherwise the next use of this object
1321 * is likely to cause a crash. Better to find out where it is getting 1315 * is likely to cause a crash. Better to find out where it is getting
1322 * improperly inserted. 1316 * improperly inserted.
1323 */ 1317 */
1324 abort (); 1318 abort ();
1325#endif 1319#endif
1320 free (dump);
1326 return op; 1321 return op;
1327 } 1322 }
1328 1323
1329 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1324 if (!QUERY_FLAG (op, FLAG_REMOVED))
1330 { 1325 {
1331 dump_object (op); 1326 char *dump = dump_object (op);
1332 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1327 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1328 free (dump);
1333 return op; 1329 return op;
1334 } 1330 }
1335 1331
1336 if (op->more != NULL) 1332 if (op->more != NULL)
1337 { 1333 {
1583 remove_ob (tmp); 1579 remove_ob (tmp);
1584 free_object (tmp); 1580 free_object (tmp);
1585 } 1581 }
1586 } 1582 }
1587 1583
1588 tmp1 = arch_to_object (find_archetype (arch_string)); 1584 tmp1 = arch_to_object (archetype::find (arch_string));
1589 1585
1590 tmp1->x = op->x; 1586 tmp1->x = op->x;
1591 tmp1->y = op->y; 1587 tmp1->y = op->y;
1592 insert_ob_in_map (tmp1, op->map, op, 0); 1588 insert_ob_in_map (tmp1, op->map, op, 0);
1593} 1589}
1774 tmp, * 1770 tmp, *
1775 otmp; 1771 otmp;
1776 1772
1777 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1773 if (!QUERY_FLAG (op, FLAG_REMOVED))
1778 { 1774 {
1779 dump_object (op); 1775 char *dump = dump_object (op);
1780 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1776 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777 free (dump);
1781 return op; 1778 return op;
1782 } 1779 }
1783 1780
1784 if (where == NULL) 1781 if (where == NULL)
1785 { 1782 {
1786 dump_object (op); 1783 char *dump = dump_object (op);
1787 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1784 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1785 free (dump);
1788 return op; 1786 return op;
1789 } 1787 }
1790 1788
1791 if (where->head) 1789 if (where->head)
1792 { 1790 {
1892 */ 1890 */
1893 1891
1894int 1892int
1895check_move_on (object *op, object *originator) 1893check_move_on (object *op, object *originator)
1896{ 1894{
1897 object * 1895 object *tmp;
1898 tmp; 1896 maptile *m = op->map;
1899 tag_t
1900 tag;
1901 mapstruct *
1902 m = op->map;
1903 int
1904 x = op->x, y = op->y; 1897 int x = op->x, y = op->y;
1905 1898
1906 MoveType 1899 MoveType move_on, move_slow, move_block;
1907 move_on,
1908 move_slow,
1909 move_block;
1910 1900
1911 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1901 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1912 return 0; 1902 return 0;
1913
1914 tag = op->count;
1915 1903
1916 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1904 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1917 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1905 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1918 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1906 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1919 1907
1980 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1968 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1981 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1969 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1982 { 1970 {
1983 move_apply (tmp, op, originator); 1971 move_apply (tmp, op, originator);
1984 1972
1985 if (was_destroyed (op, tag)) 1973 if (op->destroyed ())
1986 return 1; 1974 return 1;
1987 1975
1988 /* what the person/creature stepped onto has moved the object 1976 /* what the person/creature stepped onto has moved the object
1989 * someplace new. Don't process any further - if we did, 1977 * someplace new. Don't process any further - if we did,
1990 * have a feeling strange problems would result. 1978 * have a feeling strange problems would result.
2002 * a matching archetype at the given map and coordinates. 1990 * a matching archetype at the given map and coordinates.
2003 * The first matching object is returned, or NULL if none. 1991 * The first matching object is returned, or NULL if none.
2004 */ 1992 */
2005 1993
2006object * 1994object *
2007present_arch (const archetype *at, mapstruct *m, int x, int y) 1995present_arch (const archetype *at, maptile *m, int x, int y)
2008{ 1996{
2009 object * 1997 object *
2010 tmp; 1998 tmp;
2011 1999
2012 if (m == NULL || out_of_map (m, x, y)) 2000 if (m == NULL || out_of_map (m, x, y))
2025 * a matching type variable at the given map and coordinates. 2013 * a matching type variable at the given map and coordinates.
2026 * The first matching object is returned, or NULL if none. 2014 * The first matching object is returned, or NULL if none.
2027 */ 2015 */
2028 2016
2029object * 2017object *
2030present (unsigned char type, mapstruct *m, int x, int y) 2018present (unsigned char type, maptile *m, int x, int y)
2031{ 2019{
2032 object * 2020 object *
2033 tmp; 2021 tmp;
2034 2022
2035 if (out_of_map (m, x, y)) 2023 if (out_of_map (m, x, y))
2175 * the archetype because that isn't correct if the monster has been 2163 * the archetype because that isn't correct if the monster has been
2176 * customized, changed states, etc. 2164 * customized, changed states, etc.
2177 */ 2165 */
2178 2166
2179int 2167int
2180find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2168find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2181{ 2169{
2182 int 2170 int
2183 i, 2171 i,
2184 index = 0, flag; 2172 index = 0, flag;
2185 static int 2173 static int
2206 return -1; 2194 return -1;
2207 return altern[RANDOM () % index]; 2195 return altern[RANDOM () % index];
2208} 2196}
2209 2197
2210/* 2198/*
2211 * find_first_free_spot(archetype, mapstruct, x, y) works like 2199 * find_first_free_spot(archetype, maptile, x, y) works like
2212 * find_free_spot(), but it will search max number of squares. 2200 * find_free_spot(), but it will search max number of squares.
2213 * But it will return the first available spot, not a random choice. 2201 * But it will return the first available spot, not a random choice.
2214 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2202 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2215 */ 2203 */
2216 2204
2217int 2205int
2218find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2206find_first_free_spot (const object *ob, maptile *m, int x, int y)
2219{ 2207{
2220 int 2208 int
2221 i; 2209 i;
2222 2210
2223 for (i = 0; i < SIZEOFFREE; i++) 2211 for (i = 0; i < SIZEOFFREE; i++)
2287 * because we have to know what movement the thing looking to move 2275 * because we have to know what movement the thing looking to move
2288 * there is capable of. 2276 * there is capable of.
2289 */ 2277 */
2290 2278
2291int 2279int
2292find_dir (mapstruct *m, int x, int y, object *exclude) 2280find_dir (maptile *m, int x, int y, object *exclude)
2293{ 2281{
2294 int 2282 int
2295 i, 2283 i,
2296 max = SIZEOFFREE, mflags; 2284 max = SIZEOFFREE, mflags;
2297 2285
2298 sint16 nx, ny; 2286 sint16 nx, ny;
2299 object * 2287 object *
2300 tmp; 2288 tmp;
2301 mapstruct * 2289 maptile *
2302 mp; 2290 mp;
2303 2291
2304 MoveType blocked, move_type; 2292 MoveType blocked, move_type;
2305 2293
2306 if (exclude && exclude->head) 2294 if (exclude && exclude->head)
2514 * Modified to be map tile aware -.MSW 2502 * Modified to be map tile aware -.MSW
2515 */ 2503 */
2516 2504
2517 2505
2518int 2506int
2519can_see_monsterP (mapstruct *m, int x, int y, int dir) 2507can_see_monsterP (maptile *m, int x, int y, int dir)
2520{ 2508{
2521 sint16 dx, dy; 2509 sint16 dx, dy;
2522 int 2510 int
2523 mflags; 2511 mflags;
2524 2512
2604 if (prev) 2592 if (prev)
2605 prev->more = tmp; 2593 prev->more = tmp;
2606 prev = tmp; 2594 prev = tmp;
2607 } 2595 }
2608 2596
2609 /*** copy inventory ***/
2610 for (item = src->inv; item; item = item->below) 2597 for (item = src->inv; item; item = item->below)
2611 {
2612 (void) insert_ob_in_ob (object_create_clone (item), dst); 2598 insert_ob_in_ob (object_create_clone (item), dst);
2613 }
2614 2599
2615 return dst; 2600 return dst;
2616} 2601}
2617 2602
2618/* return true if the object was destroyed, 0 otherwise */
2619int
2620was_destroyed (const object *op, tag_t old_tag)
2621{
2622 /* checking for FLAG_FREED isn't necessary, but makes this function more
2623 * robust */
2624 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2625}
2626
2627/* GROS - Creates an object using a string representing its content. */ 2603/* GROS - Creates an object using a string representing its content. */
2628
2629/* Basically, we save the content of the string to a temp file, then call */ 2604/* Basically, we save the content of the string to a temp file, then call */
2630
2631/* load_object on it. I admit it is a highly inefficient way to make things, */ 2605/* load_object on it. I admit it is a highly inefficient way to make things, */
2632
2633/* but it was simple to make and allows reusing the load_object function. */ 2606/* but it was simple to make and allows reusing the load_object function. */
2634
2635/* Remember not to use load_object_str in a time-critical situation. */ 2607/* Remember not to use load_object_str in a time-critical situation. */
2636
2637/* Also remember that multiparts objects are not supported for now. */ 2608/* Also remember that multiparts objects are not supported for now. */
2638 2609
2639object * 2610object *
2640load_object_str (const char *obstr) 2611load_object_str (const char *obstr)
2641{ 2612{
2642 object * 2613 object *op;
2643 op;
2644 char
2645 filename[MAX_BUF]; 2614 char filename[MAX_BUF];
2646 2615
2647 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2616 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2648 2617
2649 FILE *
2650 tempfile = fopen (filename, "w"); 2618 FILE *tempfile = fopen (filename, "w");
2651 2619
2652 if (tempfile == NULL) 2620 if (tempfile == NULL)
2653 { 2621 {
2654 LOG (llevError, "Error - Unable to access load object temp file\n"); 2622 LOG (llevError, "Error - Unable to access load object temp file\n");
2655 return NULL; 2623 return NULL;
2656 }; 2624 }
2625
2657 fprintf (tempfile, obstr); 2626 fprintf (tempfile, obstr);
2658 fclose (tempfile); 2627 fclose (tempfile);
2659 2628
2660 op = get_object (); 2629 op = get_object ();
2661 2630
2675 * returns NULL if no match. 2644 * returns NULL if no match.
2676 */ 2645 */
2677object * 2646object *
2678find_obj_by_type_subtype (const object *who, int type, int subtype) 2647find_obj_by_type_subtype (const object *who, int type, int subtype)
2679{ 2648{
2680 object * 2649 object *tmp;
2681 tmp;
2682 2650
2683 for (tmp = who->inv; tmp; tmp = tmp->below) 2651 for (tmp = who->inv; tmp; tmp = tmp->below)
2684 if (tmp->type == type && tmp->subtype == subtype) 2652 if (tmp->type == type && tmp->subtype == subtype)
2685 return tmp; 2653 return tmp;
2686 2654
2694 * do the desired thing. 2662 * do the desired thing.
2695 */ 2663 */
2696key_value * 2664key_value *
2697get_ob_key_link (const object *ob, const char *key) 2665get_ob_key_link (const object *ob, const char *key)
2698{ 2666{
2699 key_value * 2667 key_value *link;
2700 link;
2701 2668
2702 for (link = ob->key_values; link != NULL; link = link->next) 2669 for (link = ob->key_values; link != NULL; link = link->next)
2703 {
2704 if (link->key == key) 2670 if (link->key == key)
2705 {
2706 return link; 2671 return link;
2707 }
2708 }
2709 2672
2710 return NULL; 2673 return NULL;
2711} 2674}
2712 2675
2713/* 2676/*
2718 * The returned string is shared. 2681 * The returned string is shared.
2719 */ 2682 */
2720const char * 2683const char *
2721get_ob_key_value (const object *op, const char *const key) 2684get_ob_key_value (const object *op, const char *const key)
2722{ 2685{
2723 key_value * 2686 key_value *link;
2724 link; 2687 shstr_cmp canonical_key (key);
2725 const char *
2726 canonical_key;
2727 2688
2728 canonical_key = shstr::find (key);
2729
2730 if (canonical_key == NULL) 2689 if (!canonical_key)
2731 { 2690 {
2732 /* 1. There being a field named key on any object 2691 /* 1. There being a field named key on any object
2733 * implies there'd be a shared string to find. 2692 * implies there'd be a shared string to find.
2734 * 2. Since there isn't, no object has this field. 2693 * 2. Since there isn't, no object has this field.
2735 * 3. Therefore, *this* object doesn't have this field. 2694 * 3. Therefore, *this* object doesn't have this field.
2736 */ 2695 */
2737 return NULL; 2696 return 0;
2738 } 2697 }
2739 2698
2740 /* This is copied from get_ob_key_link() above - 2699 /* This is copied from get_ob_key_link() above -
2741 * only 4 lines, and saves the function call overhead. 2700 * only 4 lines, and saves the function call overhead.
2742 */ 2701 */
2743 for (link = op->key_values; link != NULL; link = link->next) 2702 for (link = op->key_values; link; link = link->next)
2744 {
2745 if (link->key == canonical_key) 2703 if (link->key == canonical_key)
2746 {
2747 return link->value; 2704 return link->value;
2748 } 2705
2749 }
2750 return NULL; 2706 return 0;
2751} 2707}
2752 2708
2753 2709
2754/* 2710/*
2755 * Updates the canonical_key in op to value. 2711 * Updates the canonical_key in op to value.
2840{ 2796{
2841 shstr key_ (key); 2797 shstr key_ (key);
2842 2798
2843 return set_ob_key_value_s (op, key_, value, add_key); 2799 return set_ob_key_value_s (op, key_, value, add_key);
2844} 2800}
2801
2802object::depth_iterator::depth_iterator (object *container)
2803: iterator_base (container)
2804{
2805 while (item->inv)
2806 item = item->inv;
2807}
2808
2809void
2810object::depth_iterator::next ()
2811{
2812 if (item->below)
2813 {
2814 item = item->below;
2815
2816 while (item->inv)
2817 item = item->inv;
2818 }
2819 else
2820 item = item->env;
2821}
2822
2823// return a suitable string describing an objetc in enough detail to find it
2824const char *
2825object::debug_desc (char *info) const
2826{
2827 char info2[256 * 3];
2828 char *p = info;
2829
2830 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2831 count,
2832 &name,
2833 title ? " " : "",
2834 title ? (const char *)title : "");
2835
2836 if (env)
2837 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2838
2839 if (map)
2840 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2841
2842 return info;
2843}
2844
2845const char *
2846object::debug_desc () const
2847{
2848 static char info[256 * 3];
2849 return debug_desc (info);
2850}
2851

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines