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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.41 by root, Thu Sep 14 01:12:28 2006 UTC

1
1/* 2/*
2 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
3 4
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
… …
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
33#include <skills.h>
34#include <loader.h> 34#include <loader.h>
35 35
36int nrofallocobjects = 0; 36int nrofallocobjects = 0;
37static UUID uuid;
38const uint64 UUID_SKIP = 1<<19;
37 39
38object *objects; /* Pointer to the list of used objects */ 40object *objects; /* Pointer to the list of used objects */
39object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
40 42
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, 43short 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,
… …
49}; 51};
50int freedir[SIZEOFFREE] = { 52int 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, 53 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 54 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}; 55};
56
57static void
58write_uuid (void)
59{
60 char filename1[MAX_BUF], filename2[MAX_BUF];
61
62 sprintf (filename1, "%s/uuid", settings.localdir);
63 sprintf (filename2, "%s/uuid~", settings.localdir);
64
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76}
77
78static void
79read_uuid (void)
80{
81 char filename[MAX_BUF];
82
83 sprintf (filename, "%s/uuid", settings.localdir);
84
85 FILE *fp;
86
87 if (!(fp = fopen (filename, "r")))
88 {
89 if (errno == ENOENT)
90 {
91 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0;
93 write_uuid ();
94 return;
95 }
96
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1);
99 }
100
101 int version;
102 unsigned long long uid;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
104 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
106 _exit (1);
107 }
108
109 uuid.seq = uid;
110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid);
112 fclose (fp);
113}
114
115UUID
116gen_uuid ()
117{
118 UUID uid;
119
120 uid.seq = ++uuid.seq;
121
122 if (!(uuid.seq & (UUID_SKIP - 1)))
123 write_uuid ();
124
125 return uid;
126}
127
128void
129init_uuid ()
130{
131 read_uuid ();
132}
54 133
55/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 134/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56static int 135static int
57compare_ob_value_lists_one (const object *wants, const object *has) 136compare_ob_value_lists_one (const object *wants, const object *has)
58{ 137{
… …
207 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 286 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
208 return 0; 287 return 0;
209 288
210 switch (ob1->type) 289 switch (ob1->type)
211 { 290 {
212 case SCROLL: 291 case SCROLL:
213 if (ob1->level != ob2->level) 292 if (ob1->level != ob2->level)
214 return 0; 293 return 0;
215 break; 294 break;
216 } 295 }
217 296
218 if (ob1->key_values != NULL || ob2->key_values != NULL) 297 if (ob1->key_values != NULL || ob2->key_values != NULL)
219 { 298 {
220 /* At least one of these has key_values. */ 299 /* At least one of these has key_values. */
… …
254 { 333 {
255 if (inv->inv) 334 if (inv->inv)
256 sum_weight (inv); 335 sum_weight (inv);
257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 336 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258 } 337 }
338
259 if (op->type == CONTAINER && op->stats.Str) 339 if (op->type == CONTAINER && op->stats.Str)
260 sum = (sum * (100 - op->stats.Str)) / 100; 340 sum = (sum * (100 - op->stats.Str)) / 100;
341
261 if (op->carrying != sum) 342 if (op->carrying != sum)
262 op->carrying = sum; 343 op->carrying = sum;
344
263 return sum; 345 return sum;
264} 346}
265 347
266/** 348/**
267 * Return the outermost environment object for a given object. 349 * Return the outermost environment object for a given object.
… …
416 */ 498 */
417 499
418object * 500object *
419find_object_name (const char *str) 501find_object_name (const char *str)
420{ 502{
421 const char *name = shstr::find (str); 503 shstr_cmp str_ (str);
422 object *op; 504 object *op;
423 505
424 for (op = objects; op != NULL; op = op->next) 506 for (op = objects; op != NULL; op = op->next)
425 if (&op->name == name) 507 if (op->name == str_)
426 break; 508 break;
427 509
428 return op; 510 return op;
429} 511}
430 512
… …
442 * Changed 2004-02-12 - if the player is setting at the play again 524 * 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 525 * 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 526 * 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. 527 * anything - once an object is removed, it is basically dead anyways.
446 */ 528 */
447
448object * 529object *
449get_owner (object *op) 530object::get_owner ()
450{ 531{
451 if (op->owner == NULL) 532 if (!owner
452 return NULL; 533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
453 536
454 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455 return op->owner; 537 return owner;
456
457 op->owner = NULL;
458 op->ownercount = 0;
459 return NULL;
460}
461
462void
463clear_owner (object *op)
464{
465 if (!op)
466 return;
467
468 if (op->owner && op->ownercount == op->owner->count)
469 op->owner->refcount--;
470
471 op->owner = NULL;
472 op->ownercount = 0;
473} 538}
474 539
475/* 540/*
476 * Sets the owner and sets the skill and exp pointers to owner's current 541 * Sets the owner and sets the skill and exp pointers to owner's current
477 * skill and experience objects. 542 * skill and experience objects.
478 */ 543 */
479void 544void
480set_owner (object *op, object *owner) 545object::set_owner (object *owner)
481{ 546{
482 if (owner == NULL || op == NULL) 547 if (!owner)
483 return; 548 return;
484 549
485 /* next line added to allow objects which own objects */ 550 /* next line added to allow objects which own objects */
486 /* Add a check for ownercounts in here, as I got into an endless loop 551 /* Add a check for ownercounts in here, as I got into an endless loop
487 * with the fireball owning a poison cloud which then owned the 552 * with the fireball owning a poison cloud which then owned the
488 * fireball. I believe that was caused by one of the objects getting 553 * fireball. I believe that was caused by one of the objects getting
489 * freed and then another object replacing it. Since the ownercounts 554 * freed and then another object replacing it. Since the ownercounts
490 * didn't match, this check is valid and I believe that cause is valid. 555 * didn't match, this check is valid and I believe that cause is valid.
491 */ 556 */
492 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 557 while (owner->owner)
493 owner = owner->owner; 558 owner = owner->owner;
494 559
495 /* IF the owner still has an owner, we did not resolve to a final owner.
496 * so lets not add to that.
497 */
498 if (owner->owner)
499 return;
500
501 op->owner = owner; 560 this->owner = owner;
502
503 op->ownercount = owner->count;
504 owner->refcount++;
505}
506
507/* Set the owner to clone's current owner and set the skill and experience
508 * objects to clone's objects (typically those objects that where the owner's
509 * current skill and experience objects at the time when clone's owner was
510 * set - not the owner's current skill and experience objects).
511 *
512 * Use this function if player created an object (e.g. fire bullet, swarm
513 * spell), and this object creates further objects whose kills should be
514 * accounted for the player's original skill, even if player has changed
515 * skills meanwhile.
516 */
517void
518copy_owner (object *op, object *clone)
519{
520 object *owner = get_owner (clone);
521
522 if (owner == NULL)
523 {
524 /* players don't have owners - they own themselves. Update
525 * as appropriate.
526 */
527 if (clone->type == PLAYER)
528 owner = clone;
529 else
530 return;
531 }
532
533 set_owner (op, owner);
534} 561}
535 562
536/* Zero the key_values on op, decrementing the shared-string 563/* Zero the key_values on op, decrementing the shared-string
537 * refcounts and freeing the links. 564 * refcounts and freeing the links.
538 */ 565 */
… …
554{ 581{
555 attachable_base::clear (); 582 attachable_base::clear ();
556 583
557 free_key_values (this); 584 free_key_values (this);
558 585
559 clear_owner (this); 586 owner = 0;
560
561 name = 0; 587 name = 0;
562 name_pl = 0; 588 name_pl = 0;
563 title = 0; 589 title = 0;
564 race = 0; 590 race = 0;
565 slaying = 0; 591 slaying = 0;
566 skill = 0; 592 skill = 0;
567 msg = 0; 593 msg = 0;
568 lore = 0; 594 lore = 0;
569 custom_name = 0; 595 custom_name = 0;
570 materialname = 0; 596 materialname = 0;
597 contr = 0;
598 below = 0;
599 above = 0;
600 inv = 0;
601 container = 0;
602 env = 0;
603 more = 0;
604 head = 0;
605 map = 0;
606 active_next = 0;
607 active_prev = 0;
571 608
572 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 609 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573 610
574 SET_FLAG (this, FLAG_REMOVED); 611 SET_FLAG (this, FLAG_REMOVED);
612
613 /* What is not cleared is next, prev, and count */
614
615 expmul = 1.0;
616 face = blank_face;
617 attacked_by_count = -1;
618
619 if (settings.casting_time)
620 casting_time = -1;
575} 621}
576 622
577void object::clone (object *destination) 623void object::clone (object *destination)
578{ 624{
579 *(object_copy *) destination = *this; 625 *(object_copy *)destination = *this;
580 *(object_pod *) destination = *this; 626 *(object_pod *)destination = *this;
581 627
582 if (self || cb) 628 if (self || cb)
583 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584}
585
586/*
587 * clear_object() frees everything allocated by an object, and also
588 * clears all variables and flags to default settings.
589 */
590
591void
592clear_object (object *op)
593{
594 op->clear ();
595
596 op->contr = NULL;
597 op->below = NULL;
598 op->above = NULL;
599 op->inv = NULL;
600 op->container = NULL;
601 op->env = NULL;
602 op->more = NULL;
603 op->head = NULL;
604 op->map = NULL;
605 op->refcount = 0;
606 op->active_next = NULL;
607 op->active_prev = NULL;
608 /* What is not cleared is next, prev, and count */
609
610 op->expmul = 1.0;
611 op->face = blank_face;
612 op->attacked_by_count = -1;
613
614 if (settings.casting_time)
615 op->casting_time = -1;
616} 630}
617 631
618/* 632/*
619 * copy object first frees everything allocated by the second object, 633 * copy object first frees everything allocated by the second object,
620 * and then copies the contends of the first object into the second 634 * and then copies the contends of the first object into the second
621 * object, allocating what needs to be allocated. Basically, any 635 * object, allocating what needs to be allocated. Basically, any
622 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 636 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
623 * if the first object is freed, the pointers in the new object 637 * if the first object is freed, the pointers in the new object
624 * will point at garbage. 638 * will point at garbage.
625 */ 639 */
626
627void 640void
628copy_object (object *op2, object *op) 641copy_object (object *op2, object *op)
629{ 642{
630 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 643 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
… …
691/* 704/*
692 * Updates the speed of an object. If the speed changes from 0 to another 705 * Updates the speed of an object. If the speed changes from 0 to another
693 * value, or vice versa, then add/remove the object from the active list. 706 * value, or vice versa, then add/remove the object from the active list.
694 * This function needs to be called whenever the speed of an object changes. 707 * This function needs to be called whenever the speed of an object changes.
695 */ 708 */
696
697void 709void
698update_ob_speed (object *op) 710update_ob_speed (object *op)
699{ 711{
700 extern int arch_init; 712 extern int arch_init;
701 713
… …
710 abort (); 722 abort ();
711#else 723#else
712 op->speed = 0; 724 op->speed = 0;
713#endif 725#endif
714 } 726 }
727
715 if (arch_init) 728 if (arch_init)
716 {
717 return; 729 return;
718 } 730
719 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 731 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720 { 732 {
721 /* If already on active list, don't do anything */ 733 /* If already on active list, don't do anything */
722 if (op->active_next || op->active_prev || op == active_objects) 734 if (op->active_next || op->active_prev || op == active_objects)
723 return; 735 return;
724 736
725 /* process_events() expects us to insert the object at the beginning 737 /* process_events() expects us to insert the object at the beginning
726 * of the list. */ 738 * of the list. */
727 op->active_next = active_objects; 739 op->active_next = active_objects;
740
728 if (op->active_next != NULL) 741 if (op->active_next != NULL)
729 op->active_next->active_prev = op; 742 op->active_next->active_prev = op;
743
730 active_objects = op; 744 active_objects = op;
731 } 745 }
732 else 746 else
733 { 747 {
734 /* If not on the active list, nothing needs to be done */ 748 /* If not on the active list, nothing needs to be done */
… …
736 return; 750 return;
737 751
738 if (op->active_prev == NULL) 752 if (op->active_prev == NULL)
739 { 753 {
740 active_objects = op->active_next; 754 active_objects = op->active_next;
755
741 if (op->active_next != NULL) 756 if (op->active_next != NULL)
742 op->active_next->active_prev = NULL; 757 op->active_next->active_prev = NULL;
743 } 758 }
744 else 759 else
745 { 760 {
746 op->active_prev->active_next = op->active_next; 761 op->active_prev->active_next = op->active_next;
762
747 if (op->active_next) 763 if (op->active_next)
748 op->active_next->active_prev = op->active_prev; 764 op->active_next->active_prev = op->active_prev;
749 } 765 }
766
750 op->active_next = NULL; 767 op->active_next = NULL;
751 op->active_prev = NULL; 768 op->active_prev = NULL;
752 } 769 }
753} 770}
754 771
… …
886 * that is being removed. 903 * that is being removed.
887 */ 904 */
888 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889 update_now = 1; 906 update_now = 1;
890 else if (action == UP_OBJ_FACE) 907 else if (action == UP_OBJ_FACE)
891 /* Nothing to do for that case */; 908 /* Nothing to do for that case */ ;
892 else 909 else
893 LOG (llevError, "update_object called with invalid action: %d\n", action); 910 LOG (llevError, "update_object called with invalid action: %d\n", action);
894 911
895 if (update_now) 912 if (update_now)
896 { 913 {
… …
901 if (op->more != NULL) 918 if (op->more != NULL)
902 update_object (op->more, action); 919 update_object (op->more, action);
903} 920}
904 921
905static unordered_vector<object *> mortals; 922static unordered_vector<object *> mortals;
906static std::vector<object *> freed; 923static std::vector<object *, slice_allocator <object *> > freed;
907 924
908void object::free_mortals () 925void object::free_mortals ()
909{ 926{
910 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) 927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
911 if (!(*i)->refcount) 928 if ((*i)->refcnt)
929 ++i; // further delay freeing
930 else
912 { 931 {
932 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
913 freed.push_back (*i); 933 //freed.push_back (*i);//D
934 delete *i;
914 mortals.erase (i); 935 mortals.erase (i);
915 } 936 }
916 else 937
917 ++i; 938 if (mortals.size() && 0)//D
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
918} 940}
919 941
920object::object () 942object::object ()
921{ 943{
922 SET_FLAG (this, FLAG_REMOVED); 944 SET_FLAG (this, FLAG_REMOVED);
… …
932} 954}
933 955
934void object::link () 956void object::link ()
935{ 957{
936 count = ++ob_count; 958 count = ++ob_count;
959 uuid = gen_uuid ();
937 960
938 prev = 0; 961 prev = 0;
939 next = objects; 962 next = objects;
940 963
941 if (objects) 964 if (objects)
… …
944 objects = this; 967 objects = this;
945} 968}
946 969
947void object::unlink () 970void object::unlink ()
948{ 971{
949 count = 0; 972 //count = 0;//D
950 973 if (!prev && !next) return;//D
951 /* Remove this object from the list of used objects */
952 if (prev)
953 {
954 prev->next = next;
955 prev = 0;
956 }
957
958 if (next)
959 {
960 next->prev = prev;
961 next = 0;
962 }
963 974
964 if (this == objects) 975 if (this == objects)
965 objects = next; 976 objects = next;
977
978 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next;
980 if (next) next->prev = prev;
981
982 prev = 0;
983 next = 0;
966} 984}
967 985
968object *object::create () 986object *object::create ()
969{ 987{
970 object *op; 988 object *op;
… …
972 if (freed.empty ()) 990 if (freed.empty ())
973 op = new object; 991 op = new object;
974 else 992 else
975 { 993 {
976 // highly annoying, but the only way to get it stable right now 994 // highly annoying, but the only way to get it stable right now
977 op = freed.back (); freed.pop_back (); 995 op = freed.back ();
996 freed.pop_back ();
978 op->~object (); 997 op->~object ();
979 new ((void *)op) object; 998 new ((void *) op) object;
980 } 999 }
981 1000
982 op->link (); 1001 op->link ();
983 return op; 1002 return op;
984} 1003}
… …
993 * If free_inventory is set, free inventory as well. Else drop items in 1012 * If free_inventory is set, free inventory as well. Else drop items in
994 * inventory to the ground. 1013 * inventory to the ground.
995 */ 1014 */
996void object::free (bool free_inventory) 1015void object::free (bool free_inventory)
997{ 1016{
1017 if (QUERY_FLAG (this, FLAG_FREED))
1018 return;
1019
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021 remove_friendly_object (this);
1022
998 if (!QUERY_FLAG (this, FLAG_REMOVED)) 1023 if (!QUERY_FLAG (this, FLAG_REMOVED))
999 { 1024 remove_ob (this);
1000 LOG (llevDebug, "Free object called with non removed object\n");
1001 dump_object (this);
1002#ifdef MANY_CORES
1003 abort ();
1004#endif
1005 }
1006 1025
1007 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008 {
1009 LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010 remove_friendly_object (this);
1011 }
1012
1013 if (QUERY_FLAG (this, FLAG_FREED)) 1026 SET_FLAG (this, FLAG_FREED);
1014 { 1027
1015 dump_object (this); 1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1016 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017 return;
1018 }
1019 1029
1020 if (more) 1030 if (more)
1021 { 1031 {
1022 more->free (free_inventory); 1032 more->free (free_inventory);
1023 more = 0; 1033 more = 0;
… …
1027 { 1037 {
1028 /* Only if the space blocks everything do we not process - 1038 /* Only if the space blocks everything do we not process -
1029 * if some form of movement is allowed, let objects 1039 * if some form of movement is allowed, let objects
1030 * drop on that space. 1040 * drop on that space.
1031 */ 1041 */
1032 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 1042 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033 { 1043 {
1034 object * 1044 object *op = inv;
1035 op = inv;
1036 1045
1037 while (op) 1046 while (op)
1038 { 1047 {
1039 object *
1040 tmp = op->below; 1048 object *tmp = op->below;
1041
1042 remove_ob (op);
1043 op->free (free_inventory); 1049 op->free (free_inventory);
1044 op = tmp; 1050 op = tmp;
1045 } 1051 }
1046 } 1052 }
1047 else 1053 else
1048 { /* Put objects in inventory onto this space */ 1054 { /* Put objects in inventory onto this space */
1049 object * 1055 object *op = inv;
1050 op = inv;
1051 1056
1052 while (op) 1057 while (op)
1053 { 1058 {
1054 object *
1055 tmp = op->below; 1059 object *tmp = op->below;
1056 1060
1057 remove_ob (op); 1061 remove_ob (op);
1058 1062
1059 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 1063 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1064 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
1069 op = tmp; 1073 op = tmp;
1070 } 1074 }
1071 } 1075 }
1072 } 1076 }
1073 1077
1074 clear_owner (this); 1078 owner = 0;
1075 1079
1076 /* Remove object from the active list */ 1080 /* Remove object from the active list */
1077 speed = 0; 1081 speed = 0;
1078 update_ob_speed (this); 1082 update_ob_speed (this);
1079 1083
1080 unlink (); 1084 unlink ();
1081
1082 SET_FLAG (this, FLAG_FREED);
1083 1085
1084 mortals.push_back (this); 1086 mortals.push_back (this);
1085} 1087}
1086 1088
1087/* 1089/*
… …
1113 */ 1115 */
1114 1116
1115void 1117void
1116remove_ob (object *op) 1118remove_ob (object *op)
1117{ 1119{
1118 object *tmp, *last = NULL;
1119 object *otmp; 1120 object *
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1120 1125
1121 tag_t tag; 1126 tag_t
1127 tag;
1128 int
1122 int check_walk_off; 1129 check_walk_off;
1123 mapstruct *m; 1130 mapstruct *
1131 m;
1124 1132
1125 sint16 x, y; 1133 sint16
1134 x,
1135 y;
1126 1136
1127 if (QUERY_FLAG (op, FLAG_REMOVED)) 1137 if (QUERY_FLAG (op, FLAG_REMOVED))
1128 { 1138 return;
1129 dump_object (op);
1130 LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131 1139
1132 /* Changed it to always dump core in this case. As has been learned 1140 SET_FLAG (op, FLAG_REMOVED);
1133 * in the past, trying to recover from errors almost always
1134 * make things worse, and this is a real error here - something
1135 * that should not happen.
1136 * Yes, if this was a mission critical app, trying to do something
1137 * to recover may make sense, but that is because failure of the app
1138 * may have other disastrous problems. Cf runs out of a script
1139 * so is easily enough restarted without any real problems.
1140 * MSW 2001-07-01
1141 */
1142 abort ();
1143 }
1144 1141
1145 if (op->more != NULL) 1142 if (op->more != NULL)
1146 remove_ob (op->more); 1143 remove_ob (op->more);
1147
1148 SET_FLAG (op, FLAG_REMOVED);
1149 1144
1150 /* 1145 /*
1151 * In this case, the object to be removed is in someones 1146 * In this case, the object to be removed is in someones
1152 * inventory. 1147 * inventory.
1153 */ 1148 */
… …
1179 */ 1174 */
1180 op->x = op->env->x, op->y = op->env->y; 1175 op->x = op->env->x, op->y = op->env->y;
1181 op->map = op->env->map; 1176 op->map = op->env->map;
1182 op->above = NULL, op->below = NULL; 1177 op->above = NULL, op->below = NULL;
1183 op->env = NULL; 1178 op->env = NULL;
1184 return; 1179 }
1180 else if (op->map)
1185 } 1181 {
1186
1187 /* If we get here, we are removing it from a map */
1188 if (op->map == NULL)
1189 return;
1190
1191 x = op->x; 1182 x = op->x;
1192 y = op->y; 1183 y = op->y;
1193 m = get_map_from_coord (op->map, &x, &y); 1184 m = get_map_from_coord (op->map, &x, &y);
1194 1185
1195 if (!m) 1186 if (!m)
1196 { 1187 {
1197 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1188 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1198 op->map->path, op->x, op->y); 1189 op->map->path, op->x, op->y);
1199 /* in old days, we used to set x and y to 0 and continue. 1190 /* in old days, we used to set x and y to 0 and continue.
1200 * it seems if we get into this case, something is probablye 1191 * it seems if we get into this case, something is probablye
1201 * screwed up and should be fixed. 1192 * screwed up and should be fixed.
1193 */
1194 abort ();
1195 }
1196
1197 if (op->map != m)
1198 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1199 op->map->path, m->path, op->x, op->y, x, y);
1200
1201 /* Re did the following section of code - it looks like it had
1202 * lots of logic for things we no longer care about
1202 */ 1203 */
1203 abort ();
1204 }
1205 if (op->map != m)
1206 {
1207 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208 op->map->path, m->path, op->x, op->y, x, y);
1209 }
1210 1204
1211 /* Re did the following section of code - it looks like it had
1212 * lots of logic for things we no longer care about
1213 */
1214
1215 /* link the object above us */ 1205 /* link the object above us */
1216 if (op->above) 1206 if (op->above)
1217 op->above->below = op->below; 1207 op->above->below = op->below;
1218 else 1208 else
1219 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1209 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1220 1210
1221 /* Relink the object below us, if there is one */ 1211 /* Relink the object below us, if there is one */
1222 if (op->below) 1212 if (op->below)
1223 op->below->above = op->above; 1213 op->below->above = op->above;
1224 else 1214 else
1225 { 1215 {
1226 /* Nothing below, which means we need to relink map object for this space 1216 /* Nothing below, which means we need to relink map object for this space
1227 * use translated coordinates in case some oddness with map tiling is 1217 * use translated coordinates in case some oddness with map tiling is
1228 * evident 1218 * evident
1229 */
1230 if (GET_MAP_OB (m, x, y) != op)
1231 {
1232 dump_object (op);
1233 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1234 errmsg);
1235 dump_object (GET_MAP_OB (m, x, y));
1236 LOG (llevError, "%s\n", errmsg);
1237 }
1238
1239 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240 }
1241
1242 op->above = NULL;
1243 op->below = NULL;
1244
1245 if (op->map->in_memory == MAP_SAVING)
1246 return;
1247
1248 tag = op->count;
1249 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252 {
1253 /* No point updating the players look faces if he is the object
1254 * being removed.
1255 */
1256
1257 if (tmp->type == PLAYER && tmp != op)
1258 {
1259 /* If a container that the player is currently using somehow gets
1260 * removed (most likely destroyed), update the player view
1261 * appropriately.
1262 */ 1219 */
1263 if (tmp->container == op) 1220 if (GET_MAP_OB (m, x, y) != op)
1264 { 1221 {
1265 CLEAR_FLAG (op, FLAG_APPLIED); 1222 dump_object (op);
1266 tmp->container = NULL; 1223 LOG (llevError,
1224 "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);
1225 dump_object (GET_MAP_OB (m, x, y));
1226 LOG (llevError, "%s\n", errmsg);
1267 } 1227 }
1268 1228
1269 tmp->contr->socket.update_look = 1; 1229 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1270 }
1271 /* See if player moving off should effect something */
1272 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273 { 1230 }
1274 move_apply (tmp, op, NULL);
1275 1231
1276 if (was_destroyed (op, tag)) 1232 op->above = 0;
1233 op->below = 0;
1234
1235 if (op->map->in_memory == MAP_SAVING)
1236 return;
1237
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1240
1241 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1242 {
1243 /* No point updating the players look faces if he is the object
1244 * being removed.
1245 */
1246
1247 if (tmp->type == PLAYER && tmp != op)
1277 { 1248 {
1278 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1249 /* If a container that the player is currently using somehow gets
1250 * removed (most likely destroyed), update the player view
1251 * appropriately.
1252 */
1253 if (tmp->container == op)
1254 {
1255 CLEAR_FLAG (op, FLAG_APPLIED);
1256 tmp->container = NULL;
1257 }
1258
1259 tmp->contr->socket.update_look = 1;
1279 } 1260 }
1261
1262 /* See if player moving off should effect something */
1263 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1264 {
1265 move_apply (tmp, op, NULL);
1266
1267 if (was_destroyed (op, tag))
1268 {
1269 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1270 }
1280 } 1271 }
1281 1272
1282 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283 1274
1284 if (tmp->above == tmp) 1275 if (tmp->above == tmp)
1285 tmp->above = NULL; 1276 tmp->above = NULL;
1286 1277
1287 last = tmp; 1278 last = tmp;
1288 } 1279 }
1289 1280
1290 /* last == NULL of there are no objects on this space */ 1281 /* last == NULL of there are no objects on this space */
1291 if (last == NULL) 1282 if (last == NULL)
1292 { 1283 {
1293 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1284 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1285 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295 * those out anyways, and if there are any flags set right now, they won't 1286 * those out anyways, and if there are any flags set right now, they won't
1296 * be correct anyways. 1287 * be correct anyways.
1297 */ 1288 */
1298 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1289 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299 update_position (op->map, op->x, op->y); 1290 update_position (op->map, op->x, op->y);
1300 } 1291 }
1301 else 1292 else
1302 update_object (last, UP_OBJ_REMOVE); 1293 update_object (last, UP_OBJ_REMOVE);
1303 1294
1304 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1295 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305 update_all_los (op->map, op->x, op->y); 1296 update_all_los (op->map, op->x, op->y);
1297 }
1306} 1298}
1307 1299
1308/* 1300/*
1309 * merge_ob(op,top): 1301 * merge_ob(op,top):
1310 * 1302 *
1311 * This function goes through all objects below and including top, and 1303 * This function goes through all objects below and including top, and
1312 * merges op to the first matching object. 1304 * merges op to the first matching object.
1313 * If top is NULL, it is calculated. 1305 * If top is NULL, it is calculated.
1314 * Returns pointer to object if it succeded in the merge, otherwise NULL 1306 * Returns pointer to object if it succeded in the merge, otherwise NULL
1315 */ 1307 */
1316
1317object * 1308object *
1318merge_ob (object *op, object *top) 1309merge_ob (object *op, object *top)
1319{ 1310{
1320 if (!op->nrof) 1311 if (!op->nrof)
1321 return 0; 1312 return 0;
1313
1322 if (top == NULL) 1314 if (top == NULL)
1323 for (top = op; top != NULL && top->above != NULL; top = top->above); 1315 for (top = op; top != NULL && top->above != NULL; top = top->above);
1316
1324 for (; top != NULL; top = top->below) 1317 for (; top != NULL; top = top->below)
1325 { 1318 {
1326 if (top == op) 1319 if (top == op)
1327 continue; 1320 continue;
1328 if (CAN_MERGE (op, top)) 1321 if (CAN_MERGE (op, top))
… …
1334 remove_ob (op); 1327 remove_ob (op);
1335 free_object (op); 1328 free_object (op);
1336 return top; 1329 return top;
1337 } 1330 }
1338 } 1331 }
1332
1339 return NULL; 1333 return NULL;
1340} 1334}
1341 1335
1342/* 1336/*
1343 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1337 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1344 * job preparing multi-part monsters 1338 * job preparing multi-part monsters
1345 */ 1339 */
1346object * 1340object *
1347insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1341insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1348{ 1342{
1349 object * 1343 object *tmp;
1350 tmp;
1351 1344
1352 if (op->head) 1345 if (op->head)
1353 op = op->head; 1346 op = op->head;
1347
1354 for (tmp = op; tmp; tmp = tmp->more) 1348 for (tmp = op; tmp; tmp = tmp->more)
1355 { 1349 {
1356 tmp->x = x + tmp->arch->clone.x; 1350 tmp->x = x + tmp->arch->clone.x;
1357 tmp->y = y + tmp->arch->clone.y; 1351 tmp->y = y + tmp->arch->clone.y;
1358 } 1352 }
1353
1359 return insert_ob_in_map (op, m, originator, flag); 1354 return insert_ob_in_map (op, m, originator, flag);
1360} 1355}
1361 1356
1362/* 1357/*
1363 * insert_ob_in_map (op, map, originator, flag): 1358 * insert_ob_in_map (op, map, originator, flag):
… …
1654 * op is the object to insert it under: supplies x and the map. 1649 * op is the object to insert it under: supplies x and the map.
1655 */ 1650 */
1656void 1651void
1657replace_insert_ob_in_map (const char *arch_string, object *op) 1652replace_insert_ob_in_map (const char *arch_string, object *op)
1658{ 1653{
1659 object *tmp; 1654 object *
1655 tmp;
1660 object *tmp1; 1656 object *
1657 tmp1;
1661 1658
1662 /* first search for itself and remove any old instances */ 1659 /* first search for itself and remove any old instances */
1663 1660
1664 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1661 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665 { 1662 {
… …
1696 if (orig_ob->nrof < nr) 1693 if (orig_ob->nrof < nr)
1697 { 1694 {
1698 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1695 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699 return NULL; 1696 return NULL;
1700 } 1697 }
1698
1701 newob = object_create_clone (orig_ob); 1699 newob = object_create_clone (orig_ob);
1700
1702 if ((orig_ob->nrof -= nr) < 1) 1701 if ((orig_ob->nrof -= nr) < 1)
1703 { 1702 {
1704 if (!is_removed) 1703 if (!is_removed)
1705 remove_ob (orig_ob); 1704 remove_ob (orig_ob);
1706 free_object2 (orig_ob, 1); 1705 free_object2 (orig_ob, 1);
… …
1714 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1713 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1714 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716 return NULL; 1715 return NULL;
1717 } 1716 }
1718 } 1717 }
1718
1719 newob->nrof = nr; 1719 newob->nrof = nr;
1720 1720
1721 return newob; 1721 return newob;
1722} 1722}
1723 1723
… …
1730 */ 1730 */
1731 1731
1732object * 1732object *
1733decrease_ob_nr (object *op, uint32 i) 1733decrease_ob_nr (object *op, uint32 i)
1734{ 1734{
1735 object * 1735 object *tmp;
1736 tmp;
1737 player * 1736 player *pl;
1738 pl;
1739 1737
1740 if (i == 0) /* objects with op->nrof require this check */ 1738 if (i == 0) /* objects with op->nrof require this check */
1741 return op; 1739 return op;
1742 1740
1743 if (i > op->nrof) 1741 if (i > op->nrof)
1744 i = op->nrof; 1742 i = op->nrof;
1745 1743
1746 if (QUERY_FLAG (op, FLAG_REMOVED)) 1744 if (QUERY_FLAG (op, FLAG_REMOVED))
1747 {
1748 op->nrof -= i; 1745 op->nrof -= i;
1749 }
1750 else if (op->env != NULL) 1746 else if (op->env != NULL)
1751 { 1747 {
1752 /* is this object in the players inventory, or sub container 1748 /* is this object in the players inventory, or sub container
1753 * therein? 1749 * therein?
1754 */ 1750 */
… …
1789 } 1785 }
1790 } 1786 }
1791 } 1787 }
1792 else 1788 else
1793 { 1789 {
1794 object *
1795 above = op->above; 1790 object *above = op->above;
1796 1791
1797 if (i < op->nrof) 1792 if (i < op->nrof)
1798 {
1799 op->nrof -= i; 1793 op->nrof -= i;
1800 }
1801 else 1794 else
1802 { 1795 {
1803 remove_ob (op); 1796 remove_ob (op);
1804 op->nrof = 0; 1797 op->nrof = 0;
1805 } 1798 }
1799
1806 /* Since we just removed op, op->above is null */ 1800 /* Since we just removed op, op->above is null */
1807 for (tmp = above; tmp != NULL; tmp = tmp->above) 1801 for (tmp = above; tmp != NULL; tmp = tmp->above)
1808 if (tmp->type == PLAYER) 1802 if (tmp->type == PLAYER)
1809 { 1803 {
1810 if (op->nrof) 1804 if (op->nrof)
… …
1813 esrv_del_item (tmp->contr, op->count); 1807 esrv_del_item (tmp->contr, op->count);
1814 } 1808 }
1815 } 1809 }
1816 1810
1817 if (op->nrof) 1811 if (op->nrof)
1818 {
1819 return op; 1812 return op;
1820 }
1821 else 1813 else
1822 { 1814 {
1823 free_object (op); 1815 free_object (op);
1824 return NULL; 1816 return NULL;
1825 } 1817 }
… …
1834add_weight (object *op, signed long weight) 1826add_weight (object *op, signed long weight)
1835{ 1827{
1836 while (op != NULL) 1828 while (op != NULL)
1837 { 1829 {
1838 if (op->type == CONTAINER) 1830 if (op->type == CONTAINER)
1839 {
1840 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1831 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841 } 1832
1842 op->carrying += weight; 1833 op->carrying += weight;
1843 op = op->env; 1834 op = op->env;
1844 } 1835 }
1845} 1836}
1846 1837
… …
1869 { 1860 {
1870 dump_object (op); 1861 dump_object (op);
1871 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1862 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872 return op; 1863 return op;
1873 } 1864 }
1865
1874 if (where == NULL) 1866 if (where == NULL)
1875 { 1867 {
1876 dump_object (op); 1868 dump_object (op);
1877 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1869 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878 return op; 1870 return op;
1879 } 1871 }
1872
1880 if (where->head) 1873 if (where->head)
1881 { 1874 {
1882 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1875 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883 where = where->head; 1876 where = where->head;
1884 } 1877 }
1878
1885 if (op->more) 1879 if (op->more)
1886 { 1880 {
1887 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1881 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888 return op; 1882 return op;
1889 } 1883 }
1884
1890 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1885 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1886 CLEAR_FLAG (op, FLAG_REMOVED);
1892 if (op->nrof) 1887 if (op->nrof)
1893 { 1888 {
1894 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
… …
1979 */ 1974 */
1980 1975
1981int 1976int
1982check_move_on (object *op, object *originator) 1977check_move_on (object *op, object *originator)
1983{ 1978{
1984 object *tmp; 1979 object *
1985 tag_t tag; 1980 tmp;
1986 mapstruct *m = op->map; 1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1987 int x = op->x, y = op->y; 1986 x = op->x, y = op->y;
1988 1987
1989 MoveType move_on, move_slow, move_block; 1988 MoveType
1989 move_on,
1990 move_slow,
1991 move_block;
1990 1992
1991 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1993 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992 return 0; 1994 return 0;
1993 1995
1994 tag = op->count; 1996 tag = op->count;
… …
2042 { 2044 {
2043 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 2045 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 2046 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045 { 2047 {
2046 2048
2049 float
2047 float diff = tmp->move_slow_penalty * FABS (op->speed); 2050 diff = tmp->move_slow_penalty * FABS (op->speed);
2048 2051
2049 if (op->type == PLAYER) 2052 if (op->type == PLAYER)
2050 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 2053 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 2054 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052 diff /= 4.0; 2055 diff /= 4.0;
… …
2371find_dir (mapstruct *m, int x, int y, object *exclude) 2374find_dir (mapstruct *m, int x, int y, object *exclude)
2372{ 2375{
2373 int 2376 int
2374 i, 2377 i,
2375 max = SIZEOFFREE, mflags; 2378 max = SIZEOFFREE, mflags;
2376 sint16 2379
2377 nx, 2380 sint16 nx, ny;
2378 ny;
2379 object * 2381 object *
2380 tmp; 2382 tmp;
2381 mapstruct * 2383 mapstruct *
2382 mp; 2384 mp;
2383 MoveType 2385
2384 blocked, 2386 MoveType blocked, move_type;
2385 move_type;
2386 2387
2387 if (exclude && exclude->head) 2388 if (exclude && exclude->head)
2388 { 2389 {
2389 exclude = exclude->head; 2390 exclude = exclude->head;
2390 move_type = exclude->move_type; 2391 move_type = exclude->move_type;
… …
2597 2598
2598 2599
2599int 2600int
2600can_see_monsterP (mapstruct *m, int x, int y, int dir) 2601can_see_monsterP (mapstruct *m, int x, int y, int dir)
2601{ 2602{
2602 sint16 2603 sint16 dx, dy;
2603 dx,
2604 dy;
2605 int 2604 int
2606 mflags; 2605 mflags;
2607 2606
2608 if (dir < 0) 2607 if (dir < 0)
2609 return 0; /* exit condition: invalid direction */ 2608 return 0; /* exit condition: invalid direction */
… …
2734 2733
2735 if (tempfile == NULL) 2734 if (tempfile == NULL)
2736 { 2735 {
2737 LOG (llevError, "Error - Unable to access load object temp file\n"); 2736 LOG (llevError, "Error - Unable to access load object temp file\n");
2738 return NULL; 2737 return NULL;
2739 }; 2738 }
2739
2740 fprintf (tempfile, obstr); 2740 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2741 fclose (tempfile);
2742 2742
2743 op = get_object (); 2743 op = get_object ();
2744 2744
2745 object_thawer 2745 object_thawer thawer (filename);
2746 thawer (filename);
2747 2746
2748 if (thawer) 2747 if (thawer)
2749 load_object (thawer, op, 0); 2748 load_object (thawer, op, 0);
2750 2749
2751 LOG (llevDebug, " load str completed, object=%s\n", &op->name); 2750 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
… …
2802 * The returned string is shared. 2801 * The returned string is shared.
2803 */ 2802 */
2804const char * 2803const char *
2805get_ob_key_value (const object *op, const char *const key) 2804get_ob_key_value (const object *op, const char *const key)
2806{ 2805{
2807 key_value * 2806 key_value *link;
2808 link; 2807 shstr_cmp canonical_key (key);
2809 const char *
2810 canonical_key;
2811 2808
2812 canonical_key = shstr::find (key);
2813
2814 if (canonical_key == NULL) 2809 if (!canonical_key)
2815 { 2810 {
2816 /* 1. There being a field named key on any object 2811 /* 1. There being a field named key on any object
2817 * implies there'd be a shared string to find. 2812 * implies there'd be a shared string to find.
2818 * 2. Since there isn't, no object has this field. 2813 * 2. Since there isn't, no object has this field.
2819 * 3. Therefore, *this* object doesn't have this field. 2814 * 3. Therefore, *this* object doesn't have this field.
2820 */ 2815 */
2821 return NULL; 2816 return 0;
2822 } 2817 }
2823 2818
2824 /* This is copied from get_ob_key_link() above - 2819 /* This is copied from get_ob_key_link() above -
2825 * only 4 lines, and saves the function call overhead. 2820 * only 4 lines, and saves the function call overhead.
2826 */ 2821 */
2827 for (link = op->key_values; link != NULL; link = link->next) 2822 for (link = op->key_values; link; link = link->next)
2828 {
2829 if (link->key == canonical_key) 2823 if (link->key == canonical_key)
2830 {
2831 return link->value; 2824 return link->value;
2832 } 2825
2833 }
2834 return NULL; 2826 return 0;
2835} 2827}
2836 2828
2837 2829
2838/* 2830/*
2839 * Updates the canonical_key in op to value. 2831 * Updates the canonical_key in op to value.
… …
2875 if (last) 2867 if (last)
2876 last->next = field->next; 2868 last->next = field->next;
2877 else 2869 else
2878 op->key_values = field->next; 2870 op->key_values = field->next;
2879 2871
2880 delete
2881 field; 2872 delete field;
2882 } 2873 }
2883 } 2874 }
2884 return TRUE; 2875 return TRUE;
2885 } 2876 }
2886 /* IF we get here, key doesn't exist */ 2877 /* IF we get here, key doesn't exist */
… …
2921 * Returns TRUE on success. 2912 * Returns TRUE on success.
2922 */ 2913 */
2923int 2914int
2924set_ob_key_value (object *op, const char *key, const char *value, int add_key) 2915set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925{ 2916{
2926 shstr
2927 key_ (key); 2917 shstr key_ (key);
2928 2918
2929 return set_ob_key_value_s (op, key_, value, add_key); 2919 return set_ob_key_value_s (op, key_, value, add_key);
2930} 2920}
2921
2922object::depth_iterator::depth_iterator (object *container)
2923: iterator_base (container)
2924{
2925 while (item->inv)
2926 item = item->inv;
2927}
2928
2929void
2930object::depth_iterator::next ()
2931{
2932 if (item->below)
2933 {
2934 item = item->below;
2935
2936 while (item->inv)
2937 item = item->inv;
2938 }
2939 else
2940 item = item->env;
2941}
2942
2943// return a suitable string describing an objetc in enough detail to find it
2944const char *
2945object::debug_desc (char *info) const
2946{
2947 char info2[256 * 3];
2948 char *p = info;
2949
2950 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2951 count,
2952 &name,
2953 title ? " " : "",
2954 title ? (const char *)title : "");
2955
2956 if (env)
2957 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2958
2959 if (map)
2960 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2961
2962 return info;
2963}
2964
2965const char *
2966object::debug_desc () const
2967{
2968 static char info[256 * 3];
2969 return debug_desc (info);
2970}
2971

Diff Legend

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