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.43 by root, Thu Sep 14 17:10:24 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
… …
433{ 515{
434 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435} 517}
436 518
437/* 519/*
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 */
447
448object *
449get_owner (object *op)
450{
451 if (op->owner == NULL)
452 return NULL;
453
454 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455 return op->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}
474
475/*
476 * Sets the owner and sets the skill and exp pointers to owner's current 520 * Sets the owner and sets the skill and exp pointers to owner's current
477 * skill and experience objects. 521 * skill and experience objects.
478 */ 522 */
479void 523void
480set_owner (object *op, object *owner) 524object::set_owner (object *owner)
481{ 525{
482 if (owner == NULL || op == NULL) 526 if (!owner)
483 return; 527 return;
484 528
485 /* next line added to allow objects which own objects */ 529 /* next line added to allow objects which own objects */
486 /* Add a check for ownercounts in here, as I got into an endless loop 530 /* 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 531 * with the fireball owning a poison cloud which then owned the
488 * fireball. I believe that was caused by one of the objects getting 532 * fireball. I believe that was caused by one of the objects getting
489 * freed and then another object replacing it. Since the ownercounts 533 * 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. 534 * didn't match, this check is valid and I believe that cause is valid.
491 */ 535 */
492 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 536 while (owner->owner)
493 owner = owner->owner; 537 owner = owner->owner;
494 538
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; 539 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} 540}
535 541
536/* Zero the key_values on op, decrementing the shared-string 542/* Zero the key_values on op, decrementing the shared-string
537 * refcounts and freeing the links. 543 * refcounts and freeing the links.
538 */ 544 */
… …
554{ 560{
555 attachable_base::clear (); 561 attachable_base::clear ();
556 562
557 free_key_values (this); 563 free_key_values (this);
558 564
559 clear_owner (this); 565 owner = 0;
560
561 name = 0; 566 name = 0;
562 name_pl = 0; 567 name_pl = 0;
563 title = 0; 568 title = 0;
564 race = 0; 569 race = 0;
565 slaying = 0; 570 slaying = 0;
566 skill = 0; 571 skill = 0;
567 msg = 0; 572 msg = 0;
568 lore = 0; 573 lore = 0;
569 custom_name = 0; 574 custom_name = 0;
570 materialname = 0; 575 materialname = 0;
576 contr = 0;
577 below = 0;
578 above = 0;
579 inv = 0;
580 container = 0;
581 env = 0;
582 more = 0;
583 head = 0;
584 map = 0;
585 active_next = 0;
586 active_prev = 0;
571 587
572 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 588 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573 589
574 SET_FLAG (this, FLAG_REMOVED); 590 SET_FLAG (this, FLAG_REMOVED);
591
592 /* What is not cleared is next, prev, and count */
593
594 expmul = 1.0;
595 face = blank_face;
596
597 if (settings.casting_time)
598 casting_time = -1;
575} 599}
576 600
577void object::clone (object *destination) 601void object::clone (object *destination)
578{ 602{
579 *(object_copy *) destination = *this; 603 *(object_copy *)destination = *this;
580 *(object_pod *) destination = *this; 604 *(object_pod *)destination = *this;
581 605
582 if (self || cb) 606 if (self || cb)
583 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 607 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} 608}
617 609
618/* 610/*
619 * copy object first frees everything allocated by the second object, 611 * copy object first frees everything allocated by the second object,
620 * and then copies the contends of the first object into the second 612 * and then copies the contends of the first object into the second
621 * object, allocating what needs to be allocated. Basically, any 613 * object, allocating what needs to be allocated. Basically, any
622 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 614 * 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 615 * if the first object is freed, the pointers in the new object
624 * will point at garbage. 616 * will point at garbage.
625 */ 617 */
626
627void 618void
628copy_object (object *op2, object *op) 619copy_object (object *op2, object *op)
629{ 620{
630 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 621 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 622 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
… …
691/* 682/*
692 * Updates the speed of an object. If the speed changes from 0 to another 683 * 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. 684 * 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. 685 * This function needs to be called whenever the speed of an object changes.
695 */ 686 */
696
697void 687void
698update_ob_speed (object *op) 688update_ob_speed (object *op)
699{ 689{
700 extern int arch_init; 690 extern int arch_init;
701 691
… …
710 abort (); 700 abort ();
711#else 701#else
712 op->speed = 0; 702 op->speed = 0;
713#endif 703#endif
714 } 704 }
705
715 if (arch_init) 706 if (arch_init)
716 {
717 return; 707 return;
718 } 708
719 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 709 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720 { 710 {
721 /* If already on active list, don't do anything */ 711 /* If already on active list, don't do anything */
722 if (op->active_next || op->active_prev || op == active_objects) 712 if (op->active_next || op->active_prev || op == active_objects)
723 return; 713 return;
724 714
725 /* process_events() expects us to insert the object at the beginning 715 /* process_events() expects us to insert the object at the beginning
726 * of the list. */ 716 * of the list. */
727 op->active_next = active_objects; 717 op->active_next = active_objects;
718
728 if (op->active_next != NULL) 719 if (op->active_next != NULL)
729 op->active_next->active_prev = op; 720 op->active_next->active_prev = op;
721
730 active_objects = op; 722 active_objects = op;
731 } 723 }
732 else 724 else
733 { 725 {
734 /* If not on the active list, nothing needs to be done */ 726 /* If not on the active list, nothing needs to be done */
… …
736 return; 728 return;
737 729
738 if (op->active_prev == NULL) 730 if (op->active_prev == NULL)
739 { 731 {
740 active_objects = op->active_next; 732 active_objects = op->active_next;
733
741 if (op->active_next != NULL) 734 if (op->active_next != NULL)
742 op->active_next->active_prev = NULL; 735 op->active_next->active_prev = NULL;
743 } 736 }
744 else 737 else
745 { 738 {
746 op->active_prev->active_next = op->active_next; 739 op->active_prev->active_next = op->active_next;
740
747 if (op->active_next) 741 if (op->active_next)
748 op->active_next->active_prev = op->active_prev; 742 op->active_next->active_prev = op->active_prev;
749 } 743 }
744
750 op->active_next = NULL; 745 op->active_next = NULL;
751 op->active_prev = NULL; 746 op->active_prev = NULL;
752 } 747 }
753} 748}
754 749
… …
886 * that is being removed. 881 * that is being removed.
887 */ 882 */
888 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 883 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889 update_now = 1; 884 update_now = 1;
890 else if (action == UP_OBJ_FACE) 885 else if (action == UP_OBJ_FACE)
891 /* Nothing to do for that case */; 886 /* Nothing to do for that case */ ;
892 else 887 else
893 LOG (llevError, "update_object called with invalid action: %d\n", action); 888 LOG (llevError, "update_object called with invalid action: %d\n", action);
894 889
895 if (update_now) 890 if (update_now)
896 { 891 {
… …
901 if (op->more != NULL) 896 if (op->more != NULL)
902 update_object (op->more, action); 897 update_object (op->more, action);
903} 898}
904 899
905static unordered_vector<object *> mortals; 900static unordered_vector<object *> mortals;
906static std::vector<object *> freed;
907 901
908void object::free_mortals () 902void object::free_mortals ()
909{ 903{
910 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) 904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
911 if (!(*i)->refcount) 905 if ((*i)->refcnt)
906 ++i; // further delay freeing
907 else
912 { 908 {
913 freed.push_back (*i); 909 delete *i;
914 mortals.erase (i); 910 mortals.erase (i);
915 } 911 }
916 else 912
917 ++i; 913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
918} 920}
919 921
920object::object () 922object::object ()
921{ 923{
922 SET_FLAG (this, FLAG_REMOVED); 924 SET_FLAG (this, FLAG_REMOVED);
923 925
924 expmul = 1.0; 926 expmul = 1.0;
925 face = blank_face; 927 face = blank_face;
926 attacked_by_count = -1;
927} 928}
928 929
929object::~object () 930object::~object ()
930{ 931{
931 free_key_values (this); 932 free_key_values (this);
932} 933}
933 934
934void object::link () 935void object::link ()
935{ 936{
936 count = ++ob_count; 937 count = ++ob_count;
938 uuid = gen_uuid ();
937 939
938 prev = 0; 940 prev = 0;
939 next = objects; 941 next = objects;
940 942
941 if (objects) 943 if (objects)
… …
944 objects = this; 946 objects = this;
945} 947}
946 948
947void object::unlink () 949void object::unlink ()
948{ 950{
949 count = 0; 951 //count = 0;//D
950 952 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 953
964 if (this == objects) 954 if (this == objects)
965 objects = next; 955 objects = next;
956
957 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next;
959 if (next) next->prev = prev;
960
961 prev = 0;
962 next = 0;
966} 963}
967 964
968object *object::create () 965object *object::create ()
969{ 966{
970 object *op;
971
972 if (freed.empty ())
973 op = new object; 967 object *op = new object;
974 else
975 {
976 // highly annoying, but the only way to get it stable right now
977 op = freed.back (); freed.pop_back ();
978 op->~object ();
979 new ((void *)op) object;
980 }
981
982 op->link (); 968 op->link ();
983 return op; 969 return op;
984} 970}
985 971
986/* 972/*
… …
993 * If free_inventory is set, free inventory as well. Else drop items in 979 * If free_inventory is set, free inventory as well. Else drop items in
994 * inventory to the ground. 980 * inventory to the ground.
995 */ 981 */
996void object::free (bool free_inventory) 982void object::free (bool free_inventory)
997{ 983{
984 if (QUERY_FLAG (this, FLAG_FREED))
985 return;
986
987 if (QUERY_FLAG (this, FLAG_FRIENDLY))
988 remove_friendly_object (this);
989
998 if (!QUERY_FLAG (this, FLAG_REMOVED)) 990 if (!QUERY_FLAG (this, FLAG_REMOVED))
999 { 991 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 992
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)) 993 SET_FLAG (this, FLAG_FREED);
1014 {
1015 dump_object (this);
1016 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017 return;
1018 }
1019 994
1020 if (more) 995 if (more)
1021 { 996 {
1022 more->free (free_inventory); 997 more->free (free_inventory);
1023 more = 0; 998 more = 0;
… …
1027 { 1002 {
1028 /* Only if the space blocks everything do we not process - 1003 /* Only if the space blocks everything do we not process -
1029 * if some form of movement is allowed, let objects 1004 * if some form of movement is allowed, let objects
1030 * drop on that space. 1005 * drop on that space.
1031 */ 1006 */
1032 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033 { 1008 {
1034 object * 1009 object *op = inv;
1035 op = inv;
1036 1010
1037 while (op) 1011 while (op)
1038 { 1012 {
1039 object *
1040 tmp = op->below; 1013 object *tmp = op->below;
1041
1042 remove_ob (op);
1043 op->free (free_inventory); 1014 op->free (free_inventory);
1044 op = tmp; 1015 op = tmp;
1045 } 1016 }
1046 } 1017 }
1047 else 1018 else
1048 { /* Put objects in inventory onto this space */ 1019 { /* Put objects in inventory onto this space */
1049 object * 1020 object *op = inv;
1050 op = inv;
1051 1021
1052 while (op) 1022 while (op)
1053 { 1023 {
1054 object *
1055 tmp = op->below; 1024 object *tmp = op->below;
1056 1025
1057 remove_ob (op); 1026 remove_ob (op);
1058 1027
1059 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 1028 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)) 1029 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
1069 op = tmp; 1038 op = tmp;
1070 } 1039 }
1071 } 1040 }
1072 } 1041 }
1073 1042
1074 clear_owner (this); 1043 owner = 0;
1075 1044
1076 /* Remove object from the active list */ 1045 /* Remove object from the active list */
1077 speed = 0; 1046 speed = 0;
1078 update_ob_speed (this); 1047 update_ob_speed (this);
1079 1048
1080 unlink (); 1049 unlink ();
1081
1082 SET_FLAG (this, FLAG_FREED);
1083 1050
1084 mortals.push_back (this); 1051 mortals.push_back (this);
1085} 1052}
1086 1053
1087/* 1054/*
… …
1113 */ 1080 */
1114 1081
1115void 1082void
1116remove_ob (object *op) 1083remove_ob (object *op)
1117{ 1084{
1118 object *tmp, *last = NULL;
1119 object *otmp; 1085 object *
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1120 1090
1121 tag_t tag; 1091 tag_t
1092 tag;
1093 int
1122 int check_walk_off; 1094 check_walk_off;
1123 mapstruct *m; 1095 mapstruct *
1096 m;
1124 1097
1125 sint16 x, y; 1098 sint16
1099 x,
1100 y;
1126 1101
1127 if (QUERY_FLAG (op, FLAG_REMOVED)) 1102 if (QUERY_FLAG (op, FLAG_REMOVED))
1128 { 1103 return;
1129 dump_object (op);
1130 LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131 1104
1132 /* Changed it to always dump core in this case. As has been learned 1105 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 1106
1145 if (op->more != NULL) 1107 if (op->more != NULL)
1146 remove_ob (op->more); 1108 remove_ob (op->more);
1147
1148 SET_FLAG (op, FLAG_REMOVED);
1149 1109
1150 /* 1110 /*
1151 * In this case, the object to be removed is in someones 1111 * In this case, the object to be removed is in someones
1152 * inventory. 1112 * inventory.
1153 */ 1113 */
… …
1179 */ 1139 */
1180 op->x = op->env->x, op->y = op->env->y; 1140 op->x = op->env->x, op->y = op->env->y;
1181 op->map = op->env->map; 1141 op->map = op->env->map;
1182 op->above = NULL, op->below = NULL; 1142 op->above = NULL, op->below = NULL;
1183 op->env = NULL; 1143 op->env = NULL;
1184 return; 1144 }
1145 else if (op->map)
1185 } 1146 {
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; 1147 x = op->x;
1192 y = op->y; 1148 y = op->y;
1193 m = get_map_from_coord (op->map, &x, &y); 1149 m = get_map_from_coord (op->map, &x, &y);
1194 1150
1195 if (!m) 1151 if (!m)
1196 { 1152 {
1197 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1153 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); 1154 op->map->path, op->x, op->y);
1199 /* in old days, we used to set x and y to 0 and continue. 1155 /* 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 1156 * it seems if we get into this case, something is probablye
1201 * screwed up and should be fixed. 1157 * screwed up and should be fixed.
1158 */
1159 abort ();
1160 }
1161
1162 if (op->map != m)
1163 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1164 op->map->path, m->path, op->x, op->y, x, y);
1165
1166 /* Re did the following section of code - it looks like it had
1167 * lots of logic for things we no longer care about
1202 */ 1168 */
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 1169
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 */ 1170 /* link the object above us */
1216 if (op->above) 1171 if (op->above)
1217 op->above->below = op->below; 1172 op->above->below = op->below;
1218 else 1173 else
1219 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1174 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1220 1175
1221 /* Relink the object below us, if there is one */ 1176 /* Relink the object below us, if there is one */
1222 if (op->below) 1177 if (op->below)
1223 op->below->above = op->above; 1178 op->below->above = op->above;
1224 else 1179 else
1225 { 1180 {
1226 /* Nothing below, which means we need to relink map object for this space 1181 /* 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 1182 * use translated coordinates in case some oddness with map tiling is
1228 * evident 1183 * 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 */ 1184 */
1263 if (tmp->container == op) 1185 if (GET_MAP_OB (m, x, y) != op)
1264 { 1186 {
1265 CLEAR_FLAG (op, FLAG_APPLIED); 1187 dump_object (op);
1266 tmp->container = NULL; 1188 LOG (llevError,
1189 "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);
1190 dump_object (GET_MAP_OB (m, x, y));
1191 LOG (llevError, "%s\n", errmsg);
1267 } 1192 }
1268 1193
1269 tmp->contr->socket.update_look = 1; 1194 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 { 1195 }
1274 move_apply (tmp, op, NULL);
1275 1196
1276 if (was_destroyed (op, tag)) 1197 op->above = 0;
1198 op->below = 0;
1199
1200 if (op->map->in_memory == MAP_SAVING)
1201 return;
1202
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1205
1206 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1207 {
1208 /* No point updating the players look faces if he is the object
1209 * being removed.
1210 */
1211
1212 if (tmp->type == PLAYER && tmp != op)
1277 { 1213 {
1278 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1214 /* If a container that the player is currently using somehow gets
1215 * removed (most likely destroyed), update the player view
1216 * appropriately.
1217 */
1218 if (tmp->container == op)
1219 {
1220 CLEAR_FLAG (op, FLAG_APPLIED);
1221 tmp->container = NULL;
1222 }
1223
1224 tmp->contr->socket.update_look = 1;
1279 } 1225 }
1226
1227 /* See if player moving off should effect something */
1228 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229 {
1230 move_apply (tmp, op, NULL);
1231
1232 if (was_destroyed (op, tag))
1233 {
1234 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1235 }
1280 } 1236 }
1281 1237
1282 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283 1239
1284 if (tmp->above == tmp) 1240 if (tmp->above == tmp)
1285 tmp->above = NULL; 1241 tmp->above = NULL;
1286 1242
1287 last = tmp; 1243 last = tmp;
1288 } 1244 }
1289 1245
1290 /* last == NULL of there are no objects on this space */ 1246 /* last == NULL of there are no objects on this space */
1291 if (last == NULL) 1247 if (last == NULL)
1292 { 1248 {
1293 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1249 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1250 * 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 1251 * those out anyways, and if there are any flags set right now, they won't
1296 * be correct anyways. 1252 * be correct anyways.
1297 */ 1253 */
1298 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1254 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299 update_position (op->map, op->x, op->y); 1255 update_position (op->map, op->x, op->y);
1300 } 1256 }
1301 else 1257 else
1302 update_object (last, UP_OBJ_REMOVE); 1258 update_object (last, UP_OBJ_REMOVE);
1303 1259
1304 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1260 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305 update_all_los (op->map, op->x, op->y); 1261 update_all_los (op->map, op->x, op->y);
1262 }
1306} 1263}
1307 1264
1308/* 1265/*
1309 * merge_ob(op,top): 1266 * merge_ob(op,top):
1310 * 1267 *
1311 * This function goes through all objects below and including top, and 1268 * This function goes through all objects below and including top, and
1312 * merges op to the first matching object. 1269 * merges op to the first matching object.
1313 * If top is NULL, it is calculated. 1270 * If top is NULL, it is calculated.
1314 * Returns pointer to object if it succeded in the merge, otherwise NULL 1271 * Returns pointer to object if it succeded in the merge, otherwise NULL
1315 */ 1272 */
1316
1317object * 1273object *
1318merge_ob (object *op, object *top) 1274merge_ob (object *op, object *top)
1319{ 1275{
1320 if (!op->nrof) 1276 if (!op->nrof)
1321 return 0; 1277 return 0;
1278
1322 if (top == NULL) 1279 if (top == NULL)
1323 for (top = op; top != NULL && top->above != NULL; top = top->above); 1280 for (top = op; top != NULL && top->above != NULL; top = top->above);
1281
1324 for (; top != NULL; top = top->below) 1282 for (; top != NULL; top = top->below)
1325 { 1283 {
1326 if (top == op) 1284 if (top == op)
1327 continue; 1285 continue;
1328 if (CAN_MERGE (op, top)) 1286 if (CAN_MERGE (op, top))
… …
1334 remove_ob (op); 1292 remove_ob (op);
1335 free_object (op); 1293 free_object (op);
1336 return top; 1294 return top;
1337 } 1295 }
1338 } 1296 }
1297
1339 return NULL; 1298 return NULL;
1340} 1299}
1341 1300
1342/* 1301/*
1343 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1302 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1344 * job preparing multi-part monsters 1303 * job preparing multi-part monsters
1345 */ 1304 */
1346object * 1305object *
1347insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1306insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1348{ 1307{
1349 object * 1308 object *tmp;
1350 tmp;
1351 1309
1352 if (op->head) 1310 if (op->head)
1353 op = op->head; 1311 op = op->head;
1312
1354 for (tmp = op; tmp; tmp = tmp->more) 1313 for (tmp = op; tmp; tmp = tmp->more)
1355 { 1314 {
1356 tmp->x = x + tmp->arch->clone.x; 1315 tmp->x = x + tmp->arch->clone.x;
1357 tmp->y = y + tmp->arch->clone.y; 1316 tmp->y = y + tmp->arch->clone.y;
1358 } 1317 }
1318
1359 return insert_ob_in_map (op, m, originator, flag); 1319 return insert_ob_in_map (op, m, originator, flag);
1360} 1320}
1361 1321
1362/* 1322/*
1363 * insert_ob_in_map (op, map, originator, flag): 1323 * insert_ob_in_map (op, map, originator, flag):
… …
1654 * op is the object to insert it under: supplies x and the map. 1614 * op is the object to insert it under: supplies x and the map.
1655 */ 1615 */
1656void 1616void
1657replace_insert_ob_in_map (const char *arch_string, object *op) 1617replace_insert_ob_in_map (const char *arch_string, object *op)
1658{ 1618{
1659 object *tmp; 1619 object *
1620 tmp;
1660 object *tmp1; 1621 object *
1622 tmp1;
1661 1623
1662 /* first search for itself and remove any old instances */ 1624 /* first search for itself and remove any old instances */
1663 1625
1664 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1626 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665 { 1627 {
… …
1696 if (orig_ob->nrof < nr) 1658 if (orig_ob->nrof < nr)
1697 { 1659 {
1698 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1660 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699 return NULL; 1661 return NULL;
1700 } 1662 }
1663
1701 newob = object_create_clone (orig_ob); 1664 newob = object_create_clone (orig_ob);
1665
1702 if ((orig_ob->nrof -= nr) < 1) 1666 if ((orig_ob->nrof -= nr) < 1)
1703 { 1667 {
1704 if (!is_removed) 1668 if (!is_removed)
1705 remove_ob (orig_ob); 1669 remove_ob (orig_ob);
1706 free_object2 (orig_ob, 1); 1670 free_object2 (orig_ob, 1);
… …
1714 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1678 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"); 1679 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716 return NULL; 1680 return NULL;
1717 } 1681 }
1718 } 1682 }
1683
1719 newob->nrof = nr; 1684 newob->nrof = nr;
1720 1685
1721 return newob; 1686 return newob;
1722} 1687}
1723 1688
… …
1730 */ 1695 */
1731 1696
1732object * 1697object *
1733decrease_ob_nr (object *op, uint32 i) 1698decrease_ob_nr (object *op, uint32 i)
1734{ 1699{
1735 object * 1700 object *tmp;
1736 tmp;
1737 player * 1701 player *pl;
1738 pl;
1739 1702
1740 if (i == 0) /* objects with op->nrof require this check */ 1703 if (i == 0) /* objects with op->nrof require this check */
1741 return op; 1704 return op;
1742 1705
1743 if (i > op->nrof) 1706 if (i > op->nrof)
1744 i = op->nrof; 1707 i = op->nrof;
1745 1708
1746 if (QUERY_FLAG (op, FLAG_REMOVED)) 1709 if (QUERY_FLAG (op, FLAG_REMOVED))
1747 {
1748 op->nrof -= i; 1710 op->nrof -= i;
1749 }
1750 else if (op->env != NULL) 1711 else if (op->env != NULL)
1751 { 1712 {
1752 /* is this object in the players inventory, or sub container 1713 /* is this object in the players inventory, or sub container
1753 * therein? 1714 * therein?
1754 */ 1715 */
… …
1789 } 1750 }
1790 } 1751 }
1791 } 1752 }
1792 else 1753 else
1793 { 1754 {
1794 object *
1795 above = op->above; 1755 object *above = op->above;
1796 1756
1797 if (i < op->nrof) 1757 if (i < op->nrof)
1798 {
1799 op->nrof -= i; 1758 op->nrof -= i;
1800 }
1801 else 1759 else
1802 { 1760 {
1803 remove_ob (op); 1761 remove_ob (op);
1804 op->nrof = 0; 1762 op->nrof = 0;
1805 } 1763 }
1764
1806 /* Since we just removed op, op->above is null */ 1765 /* Since we just removed op, op->above is null */
1807 for (tmp = above; tmp != NULL; tmp = tmp->above) 1766 for (tmp = above; tmp != NULL; tmp = tmp->above)
1808 if (tmp->type == PLAYER) 1767 if (tmp->type == PLAYER)
1809 { 1768 {
1810 if (op->nrof) 1769 if (op->nrof)
… …
1813 esrv_del_item (tmp->contr, op->count); 1772 esrv_del_item (tmp->contr, op->count);
1814 } 1773 }
1815 } 1774 }
1816 1775
1817 if (op->nrof) 1776 if (op->nrof)
1818 {
1819 return op; 1777 return op;
1820 }
1821 else 1778 else
1822 { 1779 {
1823 free_object (op); 1780 free_object (op);
1824 return NULL; 1781 return NULL;
1825 } 1782 }
… …
1834add_weight (object *op, signed long weight) 1791add_weight (object *op, signed long weight)
1835{ 1792{
1836 while (op != NULL) 1793 while (op != NULL)
1837 { 1794 {
1838 if (op->type == CONTAINER) 1795 if (op->type == CONTAINER)
1839 {
1840 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1796 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841 } 1797
1842 op->carrying += weight; 1798 op->carrying += weight;
1843 op = op->env; 1799 op = op->env;
1844 } 1800 }
1845} 1801}
1846 1802
… …
1869 { 1825 {
1870 dump_object (op); 1826 dump_object (op);
1871 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1827 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872 return op; 1828 return op;
1873 } 1829 }
1830
1874 if (where == NULL) 1831 if (where == NULL)
1875 { 1832 {
1876 dump_object (op); 1833 dump_object (op);
1877 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1834 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878 return op; 1835 return op;
1879 } 1836 }
1837
1880 if (where->head) 1838 if (where->head)
1881 { 1839 {
1882 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1840 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883 where = where->head; 1841 where = where->head;
1884 } 1842 }
1843
1885 if (op->more) 1844 if (op->more)
1886 { 1845 {
1887 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1846 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888 return op; 1847 return op;
1889 } 1848 }
1849
1890 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1850 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1851 CLEAR_FLAG (op, FLAG_REMOVED);
1892 if (op->nrof) 1852 if (op->nrof)
1893 { 1853 {
1894 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1854 for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
… …
1979 */ 1939 */
1980 1940
1981int 1941int
1982check_move_on (object *op, object *originator) 1942check_move_on (object *op, object *originator)
1983{ 1943{
1984 object *tmp; 1944 object *
1985 tag_t tag; 1945 tmp;
1986 mapstruct *m = op->map; 1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1987 int x = op->x, y = op->y; 1951 x = op->x, y = op->y;
1988 1952
1989 MoveType move_on, move_slow, move_block; 1953 MoveType
1954 move_on,
1955 move_slow,
1956 move_block;
1990 1957
1991 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1958 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992 return 0; 1959 return 0;
1993 1960
1994 tag = op->count; 1961 tag = op->count;
… …
2042 { 2009 {
2043 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 2010 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)) 2011 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045 { 2012 {
2046 2013
2014 float
2047 float diff = tmp->move_slow_penalty * FABS (op->speed); 2015 diff = tmp->move_slow_penalty * FABS (op->speed);
2048 2016
2049 if (op->type == PLAYER) 2017 if (op->type == PLAYER)
2050 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 2018 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))) 2019 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052 diff /= 4.0; 2020 diff /= 4.0;
… …
2371find_dir (mapstruct *m, int x, int y, object *exclude) 2339find_dir (mapstruct *m, int x, int y, object *exclude)
2372{ 2340{
2373 int 2341 int
2374 i, 2342 i,
2375 max = SIZEOFFREE, mflags; 2343 max = SIZEOFFREE, mflags;
2376 sint16 2344
2377 nx, 2345 sint16 nx, ny;
2378 ny;
2379 object * 2346 object *
2380 tmp; 2347 tmp;
2381 mapstruct * 2348 mapstruct *
2382 mp; 2349 mp;
2383 MoveType 2350
2384 blocked, 2351 MoveType blocked, move_type;
2385 move_type;
2386 2352
2387 if (exclude && exclude->head) 2353 if (exclude && exclude->head)
2388 { 2354 {
2389 exclude = exclude->head; 2355 exclude = exclude->head;
2390 move_type = exclude->move_type; 2356 move_type = exclude->move_type;
… …
2597 2563
2598 2564
2599int 2565int
2600can_see_monsterP (mapstruct *m, int x, int y, int dir) 2566can_see_monsterP (mapstruct *m, int x, int y, int dir)
2601{ 2567{
2602 sint16 2568 sint16 dx, dy;
2603 dx,
2604 dy;
2605 int 2569 int
2606 mflags; 2570 mflags;
2607 2571
2608 if (dir < 0) 2572 if (dir < 0)
2609 return 0; /* exit condition: invalid direction */ 2573 return 0; /* exit condition: invalid direction */
… …
2734 2698
2735 if (tempfile == NULL) 2699 if (tempfile == NULL)
2736 { 2700 {
2737 LOG (llevError, "Error - Unable to access load object temp file\n"); 2701 LOG (llevError, "Error - Unable to access load object temp file\n");
2738 return NULL; 2702 return NULL;
2739 }; 2703 }
2704
2740 fprintf (tempfile, obstr); 2705 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2706 fclose (tempfile);
2742 2707
2743 op = get_object (); 2708 op = get_object ();
2744 2709
2745 object_thawer 2710 object_thawer thawer (filename);
2746 thawer (filename);
2747 2711
2748 if (thawer) 2712 if (thawer)
2749 load_object (thawer, op, 0); 2713 load_object (thawer, op, 0);
2750 2714
2751 LOG (llevDebug, " load str completed, object=%s\n", &op->name); 2715 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
… …
2802 * The returned string is shared. 2766 * The returned string is shared.
2803 */ 2767 */
2804const char * 2768const char *
2805get_ob_key_value (const object *op, const char *const key) 2769get_ob_key_value (const object *op, const char *const key)
2806{ 2770{
2807 key_value * 2771 key_value *link;
2808 link; 2772 shstr_cmp canonical_key (key);
2809 const char *
2810 canonical_key;
2811 2773
2812 canonical_key = shstr::find (key);
2813
2814 if (canonical_key == NULL) 2774 if (!canonical_key)
2815 { 2775 {
2816 /* 1. There being a field named key on any object 2776 /* 1. There being a field named key on any object
2817 * implies there'd be a shared string to find. 2777 * implies there'd be a shared string to find.
2818 * 2. Since there isn't, no object has this field. 2778 * 2. Since there isn't, no object has this field.
2819 * 3. Therefore, *this* object doesn't have this field. 2779 * 3. Therefore, *this* object doesn't have this field.
2820 */ 2780 */
2821 return NULL; 2781 return 0;
2822 } 2782 }
2823 2783
2824 /* This is copied from get_ob_key_link() above - 2784 /* This is copied from get_ob_key_link() above -
2825 * only 4 lines, and saves the function call overhead. 2785 * only 4 lines, and saves the function call overhead.
2826 */ 2786 */
2827 for (link = op->key_values; link != NULL; link = link->next) 2787 for (link = op->key_values; link; link = link->next)
2828 {
2829 if (link->key == canonical_key) 2788 if (link->key == canonical_key)
2830 {
2831 return link->value; 2789 return link->value;
2832 } 2790
2833 }
2834 return NULL; 2791 return 0;
2835} 2792}
2836 2793
2837 2794
2838/* 2795/*
2839 * Updates the canonical_key in op to value. 2796 * Updates the canonical_key in op to value.
… …
2875 if (last) 2832 if (last)
2876 last->next = field->next; 2833 last->next = field->next;
2877 else 2834 else
2878 op->key_values = field->next; 2835 op->key_values = field->next;
2879 2836
2880 delete
2881 field; 2837 delete field;
2882 } 2838 }
2883 } 2839 }
2884 return TRUE; 2840 return TRUE;
2885 } 2841 }
2886 /* IF we get here, key doesn't exist */ 2842 /* IF we get here, key doesn't exist */
… …
2921 * Returns TRUE on success. 2877 * Returns TRUE on success.
2922 */ 2878 */
2923int 2879int
2924set_ob_key_value (object *op, const char *key, const char *value, int add_key) 2880set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925{ 2881{
2926 shstr
2927 key_ (key); 2882 shstr key_ (key);
2928 2883
2929 return set_ob_key_value_s (op, key_, value, add_key); 2884 return set_ob_key_value_s (op, key_, value, add_key);
2930} 2885}
2886
2887object::depth_iterator::depth_iterator (object *container)
2888: iterator_base (container)
2889{
2890 while (item->inv)
2891 item = item->inv;
2892}
2893
2894void
2895object::depth_iterator::next ()
2896{
2897 if (item->below)
2898 {
2899 item = item->below;
2900
2901 while (item->inv)
2902 item = item->inv;
2903 }
2904 else
2905 item = item->env;
2906}
2907
2908// return a suitable string describing an objetc in enough detail to find it
2909const char *
2910object::debug_desc (char *info) const
2911{
2912 char info2[256 * 3];
2913 char *p = info;
2914
2915 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2916 count,
2917 &name,
2918 title ? " " : "",
2919 title ? (const char *)title : "");
2920
2921 if (env)
2922 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2923
2924 if (map)
2925 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2926
2927 return info;
2928}
2929
2930const char *
2931object::debug_desc () const
2932{
2933 static char info[256 * 3];
2934 return debug_desc (info);
2935}
2936

Diff Legend

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