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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <skills.h>
35#include <loader.h> 33#include <loader.h>
36 34
37int nrofallocobjects = 0; 35int nrofallocobjects = 0;
36static UUID uuid;
37const uint64 UUID_SKIP = 1<<19;
38 38
39object *objects; /* Pointer to the list of used objects */
40object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
41 40
42short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
43 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
44}; 43};
50}; 49};
51int freedir[SIZEOFFREE] = { 50int freedir[SIZEOFFREE] = {
52 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
53 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
54}; 53};
54
55static void
56write_uuid (void)
57{
58 char filename1[MAX_BUF], filename2[MAX_BUF];
59
60 sprintf (filename1, "%s/uuid", settings.localdir);
61 sprintf (filename2, "%s/uuid~", settings.localdir);
62
63 FILE *fp;
64
65 if (!(fp = fopen (filename2, "w")))
66 {
67 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68 return;
69 }
70
71 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72 fclose (fp);
73 rename (filename2, filename1);
74}
75
76static void
77read_uuid (void)
78{
79 char filename[MAX_BUF];
80
81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 FILE *fp;
84
85 if (!(fp = fopen (filename, "r")))
86 {
87 if (errno == ENOENT)
88 {
89 LOG (llevInfo, "RESET uid to 1\n");
90 uuid.seq = 0;
91 write_uuid ();
92 return;
93 }
94
95 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96 _exit (1);
97 }
98
99 int version;
100 unsigned long long uid;
101 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
102 {
103 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
104 _exit (1);
105 }
106
107 uuid.seq = uid;
108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid);
110 fclose (fp);
111}
112
113UUID
114gen_uuid ()
115{
116 UUID uid;
117
118 uid.seq = ++uuid.seq;
119
120 if (!(uuid.seq & (UUID_SKIP - 1)))
121 write_uuid ();
122
123 return uid;
124}
125
126void
127init_uuid ()
128{
129 read_uuid ();
130}
55 131
56/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 132/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
57static int 133static int
58compare_ob_value_lists_one (const object *wants, const object *has) 134compare_ob_value_lists_one (const object *wants, const object *has)
59{ 135{
255 { 331 {
256 if (inv->inv) 332 if (inv->inv)
257 sum_weight (inv); 333 sum_weight (inv);
258 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
259 } 335 }
336
260 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
261 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
339
262 if (op->carrying != sum) 340 if (op->carrying != sum)
263 op->carrying = sum; 341 op->carrying = sum;
342
264 return sum; 343 return sum;
265} 344}
266 345
267/** 346/**
268 * Return the outermost environment object for a given object. 347 * Return the outermost environment object for a given object.
366void 445void
367dump_all_objects (void) 446dump_all_objects (void)
368{ 447{
369 object *op; 448 object *op;
370 449
371 for (op = objects; op != NULL; op = op->next) 450 for (op = object::first; op != NULL; op = op->next)
372 { 451 {
373 dump_object (op); 452 dump_object (op);
374 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg); 453 fprintf (logfile, "Object %s\n", errmsg);
375 } 454 }
376} 455}
377 456
378/* 457/*
379 * get_nearest_part(multi-object, object 2) returns the part of the 458 * get_nearest_part(multi-object, object 2) returns the part of the
402object * 481object *
403find_object (tag_t i) 482find_object (tag_t i)
404{ 483{
405 object *op; 484 object *op;
406 485
407 for (op = objects; op != NULL; op = op->next) 486 for (op = object::first; op != NULL; op = op->next)
408 if (op->count == i) 487 if (op->count == i)
409 break; 488 break;
489
410 return op; 490 return op;
411} 491}
412 492
413/* 493/*
414 * Returns the first object which has a name equal to the argument. 494 * Returns the first object which has a name equal to the argument.
417 */ 497 */
418 498
419object * 499object *
420find_object_name (const char *str) 500find_object_name (const char *str)
421{ 501{
422 const char *name = shstr::find (str); 502 shstr_cmp str_ (str);
423 object *op; 503 object *op;
424 504
425 for (op = objects; op != NULL; op = op->next) 505 for (op = object::first; op != NULL; op = op->next)
426 if (&op->name == name) 506 if (op->name == str_)
427 break; 507 break;
428 508
429 return op; 509 return op;
430} 510}
431 511
434{ 514{
435 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 515 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
436} 516}
437 517
438/* 518/*
439 * Returns the object which this object marks as being the owner.
440 * A id-scheme is used to avoid pointing to objects which have been
441 * freed and are now reused. If this is detected, the owner is
442 * set to NULL, and NULL is returned.
443 * Changed 2004-02-12 - if the player is setting at the play again
444 * prompt, he is removed, and we don't want to treat him as an owner of
445 * anything, so check removed flag. I don't expect that this should break
446 * anything - once an object is removed, it is basically dead anyways.
447 */
448
449object *
450get_owner (object *op)
451{
452 if (op->owner == NULL)
453 return NULL;
454
455 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
456 return op->owner;
457
458 op->owner = NULL;
459 op->ownercount = 0;
460 return NULL;
461}
462
463void
464clear_owner (object *op)
465{
466 if (!op)
467 return;
468
469 if (op->owner && op->ownercount == op->owner->count)
470 op->owner->refcount--;
471
472 op->owner = NULL;
473 op->ownercount = 0;
474}
475
476/*
477 * Sets the owner and sets the skill and exp pointers to owner's current 519 * Sets the owner and sets the skill and exp pointers to owner's current
478 * skill and experience objects. 520 * skill and experience objects.
479 */ 521 */
480void 522void
481set_owner (object *op, object *owner) 523object::set_owner (object *owner)
482{ 524{
483 if (owner == NULL || op == NULL) 525 if (!owner)
484 return; 526 return;
485 527
486 /* next line added to allow objects which own objects */ 528 /* next line added to allow objects which own objects */
487 /* Add a check for ownercounts in here, as I got into an endless loop 529 /* Add a check for ownercounts in here, as I got into an endless loop
488 * with the fireball owning a poison cloud which then owned the 530 * with the fireball owning a poison cloud which then owned the
489 * fireball. I believe that was caused by one of the objects getting 531 * fireball. I believe that was caused by one of the objects getting
490 * freed and then another object replacing it. Since the ownercounts 532 * freed and then another object replacing it. Since the ownercounts
491 * didn't match, this check is valid and I believe that cause is valid. 533 * didn't match, this check is valid and I believe that cause is valid.
492 */ 534 */
493 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 535 while (owner->owner)
494 owner = owner->owner; 536 owner = owner->owner;
495 537
496 /* IF the owner still has an owner, we did not resolve to a final owner.
497 * so lets not add to that.
498 */
499 if (owner->owner)
500 return;
501
502 op->owner = owner; 538 this->owner = owner;
503
504 op->ownercount = owner->count;
505 owner->refcount++;
506}
507
508/* Set the owner to clone's current owner and set the skill and experience
509 * objects to clone's objects (typically those objects that where the owner's
510 * current skill and experience objects at the time when clone's owner was
511 * set - not the owner's current skill and experience objects).
512 *
513 * Use this function if player created an object (e.g. fire bullet, swarm
514 * spell), and this object creates further objects whose kills should be
515 * accounted for the player's original skill, even if player has changed
516 * skills meanwhile.
517 */
518void
519copy_owner (object *op, object *clone)
520{
521 object *owner = get_owner (clone);
522
523 if (owner == NULL)
524 {
525 /* players don't have owners - they own themselves. Update
526 * as appropriate.
527 */
528 if (clone->type == PLAYER)
529 owner = clone;
530 else
531 return;
532 }
533
534 set_owner (op, owner);
535} 539}
536 540
537/* Zero the key_values on op, decrementing the shared-string 541/* Zero the key_values on op, decrementing the shared-string
538 * refcounts and freeing the links. 542 * refcounts and freeing the links.
539 */ 543 */
555{ 559{
556 attachable_base::clear (); 560 attachable_base::clear ();
557 561
558 free_key_values (this); 562 free_key_values (this);
559 563
560 clear_owner (this); 564 owner = 0;
561
562 name = 0; 565 name = 0;
563 name_pl = 0; 566 name_pl = 0;
564 title = 0; 567 title = 0;
565 race = 0; 568 race = 0;
566 slaying = 0; 569 slaying = 0;
567 skill = 0; 570 skill = 0;
568 msg = 0; 571 msg = 0;
569 lore = 0; 572 lore = 0;
570 custom_name = 0; 573 custom_name = 0;
571 materialname = 0; 574 materialname = 0;
575 contr = 0;
576 below = 0;
577 above = 0;
578 inv = 0;
579 container = 0;
580 env = 0;
581 more = 0;
582 head = 0;
583 map = 0;
584 active_next = 0;
585 active_prev = 0;
572 586
573 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 587 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
574 588
575 SET_FLAG (this, FLAG_REMOVED); 589 SET_FLAG (this, FLAG_REMOVED);
590
591 /* What is not cleared is next, prev, and count */
592
593 expmul = 1.0;
594 face = blank_face;
595
596 if (settings.casting_time)
597 casting_time = -1;
576} 598}
577 599
578void object::clone (object *destination) 600void object::clone (object *destination)
579{ 601{
580 *(object_copy *) destination = *this; 602 *(object_copy *)destination = *this;
581 *(object_pod *) destination = *this; 603 *(object_pod *)destination = *this;
582 604
583 if (self || cb) 605 if (self || cb)
584 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 606 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
585}
586
587/*
588 * clear_object() frees everything allocated by an object, and also
589 * clears all variables and flags to default settings.
590 */
591
592void
593clear_object (object *op)
594{
595 op->clear ();
596
597 op->contr = NULL;
598 op->below = NULL;
599 op->above = NULL;
600 op->inv = NULL;
601 op->container = NULL;
602 op->env = NULL;
603 op->more = NULL;
604 op->head = NULL;
605 op->map = NULL;
606 op->refcount = 0;
607 op->active_next = NULL;
608 op->active_prev = NULL;
609 /* What is not cleared is next, prev, and count */
610
611 op->expmul = 1.0;
612 op->face = blank_face;
613 op->attacked_by_count = -1;
614
615 if (settings.casting_time)
616 op->casting_time = -1;
617} 607}
618 608
619/* 609/*
620 * copy object first frees everything allocated by the second object, 610 * copy object first frees everything allocated by the second object,
621 * and then copies the contends of the first object into the second 611 * and then copies the contends of the first object into the second
622 * object, allocating what needs to be allocated. Basically, any 612 * object, allocating what needs to be allocated. Basically, any
623 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 613 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
624 * if the first object is freed, the pointers in the new object 614 * if the first object is freed, the pointers in the new object
625 * will point at garbage. 615 * will point at garbage.
626 */ 616 */
627
628void 617void
629copy_object (object *op2, object *op) 618copy_object (object *op2, object *op)
630{ 619{
631 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 620 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
632 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
692/* 681/*
693 * Updates the speed of an object. If the speed changes from 0 to another 682 * Updates the speed of an object. If the speed changes from 0 to another
694 * value, or vice versa, then add/remove the object from the active list. 683 * value, or vice versa, then add/remove the object from the active list.
695 * This function needs to be called whenever the speed of an object changes. 684 * This function needs to be called whenever the speed of an object changes.
696 */ 685 */
697
698void 686void
699update_ob_speed (object *op) 687update_ob_speed (object *op)
700{ 688{
701 extern int arch_init; 689 extern int arch_init;
702 690
711 abort (); 699 abort ();
712#else 700#else
713 op->speed = 0; 701 op->speed = 0;
714#endif 702#endif
715 } 703 }
704
716 if (arch_init) 705 if (arch_init)
717 {
718 return; 706 return;
719 } 707
720 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 708 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
721 { 709 {
722 /* If already on active list, don't do anything */ 710 /* If already on active list, don't do anything */
723 if (op->active_next || op->active_prev || op == active_objects) 711 if (op->active_next || op->active_prev || op == active_objects)
724 return; 712 return;
725 713
726 /* process_events() expects us to insert the object at the beginning 714 /* process_events() expects us to insert the object at the beginning
727 * of the list. */ 715 * of the list. */
728 op->active_next = active_objects; 716 op->active_next = active_objects;
717
729 if (op->active_next != NULL) 718 if (op->active_next != NULL)
730 op->active_next->active_prev = op; 719 op->active_next->active_prev = op;
720
731 active_objects = op; 721 active_objects = op;
732 } 722 }
733 else 723 else
734 { 724 {
735 /* If not on the active list, nothing needs to be done */ 725 /* If not on the active list, nothing needs to be done */
737 return; 727 return;
738 728
739 if (op->active_prev == NULL) 729 if (op->active_prev == NULL)
740 { 730 {
741 active_objects = op->active_next; 731 active_objects = op->active_next;
732
742 if (op->active_next != NULL) 733 if (op->active_next != NULL)
743 op->active_next->active_prev = NULL; 734 op->active_next->active_prev = NULL;
744 } 735 }
745 else 736 else
746 { 737 {
747 op->active_prev->active_next = op->active_next; 738 op->active_prev->active_next = op->active_next;
739
748 if (op->active_next) 740 if (op->active_next)
749 op->active_next->active_prev = op->active_prev; 741 op->active_next->active_prev = op->active_prev;
750 } 742 }
743
751 op->active_next = NULL; 744 op->active_next = NULL;
752 op->active_prev = NULL; 745 op->active_prev = NULL;
753 } 746 }
754} 747}
755 748
901 894
902 if (op->more != NULL) 895 if (op->more != NULL)
903 update_object (op->more, action); 896 update_object (op->more, action);
904} 897}
905 898
906static unordered_vector < object *>mortals; 899object::vector object::mortals;
907static 900object::vector object::objects; // not yet used
908std::vector < object *> 901object *object::first;
909 freed;
910 902
911void object::free_mortals () 903void object::free_mortals ()
912{ 904{
913 for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();) 905 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
914 if (!(*i)->refcount) 906 if ((*i)->refcnt)
907 ++i; // further delay freeing
908 else
915 { 909 {
916 freed.push_back (*i); 910 delete *i;
917 mortals.erase (i); 911 mortals.erase (i);
918 } 912 }
919 else 913
920 ++i; 914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 921}
922 922
923object::object () 923object::object ()
924{ 924{
925 SET_FLAG (this, FLAG_REMOVED); 925 SET_FLAG (this, FLAG_REMOVED);
926 926
927 expmul = 1.0; 927 expmul = 1.0;
928 face = blank_face; 928 face = blank_face;
929 attacked_by_count = -1;
930} 929}
931 930
932object::~object () 931object::~object ()
933{ 932{
934 free_key_values (this); 933 free_key_values (this);
935} 934}
936 935
937void object::link () 936void object::link ()
938{ 937{
939 count = ++ob_count; 938 count = ++ob_count;
939 uuid = gen_uuid ();
940 940
941 prev = 0; 941 prev = 0;
942 next = objects; 942 next = object::first;
943 943
944 if (objects) 944 if (object::first)
945 objects->prev = this; 945 object::first->prev = this;
946 946
947 objects = this; 947 object::first = this;
948} 948}
949 949
950void object::unlink () 950void object::unlink ()
951{ 951{
952 count = 0; 952 if (this == object::first)
953 object::first = next;
953 954
954 /* Remove this object from the list of used objects */ 955 /* Remove this object from the list of used objects */
955 if (prev)
956 {
957 prev->next = next; 956 if (prev) prev->next = next;
957 if (next) next->prev = prev;
958
958 prev = 0; 959 prev = 0;
959 }
960
961 if (next)
962 {
963 next->prev = prev;
964 next = 0; 960 next = 0;
965 }
966
967 if (this == objects)
968 objects = next;
969} 961}
970 962
971object *object::create () 963object *object::create ()
972{ 964{
973 object *
974 op;
975
976 if (freed.empty ())
977 op = new object; 965 object *op = new object;
978
979 else
980 {
981 // highly annoying, but the only way to get it stable right now
982 op = freed.back ();
983 freed.pop_back ();
984 op->~object ();
985 new ((void *) op) object;
986 }
987
988 op->link (); 966 op->link ();
989 return op; 967 return op;
990} 968}
991 969
992/* 970/*
1002void object::free (bool free_inventory) 980void object::free (bool free_inventory)
1003{ 981{
1004 if (QUERY_FLAG (this, FLAG_FREED)) 982 if (QUERY_FLAG (this, FLAG_FREED))
1005 return; 983 return;
1006 984
985 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this);
987
1007 if (!QUERY_FLAG (this, FLAG_REMOVED)) 988 if (!QUERY_FLAG (this, FLAG_REMOVED))
1008 remove_ob (this); 989 remove_ob (this);
1009
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this);
1012 990
1013 SET_FLAG (this, FLAG_FREED); 991 SET_FLAG (this, FLAG_FREED);
1014 992
1015 if (more) 993 if (more)
1016 { 994 {
1022 { 1000 {
1023 /* Only if the space blocks everything do we not process - 1001 /* Only if the space blocks everything do we not process -
1024 * if some form of movement is allowed, let objects 1002 * if some form of movement is allowed, let objects
1025 * drop on that space. 1003 * drop on that space.
1026 */ 1004 */
1027 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 1005 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1028 { 1006 {
1029 object *op = inv; 1007 object *op = inv;
1030 1008
1031 while (op) 1009 while (op)
1032 { 1010 {
1058 op = tmp; 1036 op = tmp;
1059 } 1037 }
1060 } 1038 }
1061 } 1039 }
1062 1040
1063 clear_owner (this); 1041 // clear those pointers that likely might have circular references to us
1042 owner = 0;
1043 enemy = 0;
1044 attacked_by = 0;
1064 1045
1065 /* Remove object from the active list */ 1046 /* Remove object from the active list */
1066 speed = 0; 1047 speed = 0;
1067 update_ob_speed (this); 1048 update_ob_speed (this);
1068 1049
1080sub_weight (object *op, signed long weight) 1061sub_weight (object *op, signed long weight)
1081{ 1062{
1082 while (op != NULL) 1063 while (op != NULL)
1083 { 1064 {
1084 if (op->type == CONTAINER) 1065 if (op->type == CONTAINER)
1085 {
1086 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1087 } 1067
1088 op->carrying -= weight; 1068 op->carrying -= weight;
1089 op = op->env; 1069 op = op->env;
1090 } 1070 }
1091} 1071}
1092 1072
1100 */ 1080 */
1101 1081
1102void 1082void
1103remove_ob (object *op) 1083remove_ob (object *op)
1104{ 1084{
1085 object *tmp, *last = 0;
1105 object * 1086 object *otmp;
1106 tmp, *
1107 last = NULL;
1108 object *
1109 otmp;
1110 1087
1111 tag_t
1112 tag;
1113 int
1114 check_walk_off; 1088 int check_walk_off;
1115 mapstruct * 1089 maptile *m;
1116 m;
1117 1090
1118 sint16 1091 sint16 x, y;
1119 x,
1120 y;
1121 1092
1122 if (QUERY_FLAG (op, FLAG_REMOVED)) 1093 if (QUERY_FLAG (op, FLAG_REMOVED))
1123 return; 1094 return;
1124 1095
1125 SET_FLAG (op, FLAG_REMOVED); 1096 SET_FLAG (op, FLAG_REMOVED);
1218 op->below = 0; 1189 op->below = 0;
1219 1190
1220 if (op->map->in_memory == MAP_SAVING) 1191 if (op->map->in_memory == MAP_SAVING)
1221 return; 1192 return;
1222 1193
1223 tag = op->count;
1224 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1225 1195
1226 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1196 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1227 { 1197 {
1228 /* No point updating the players look faces if he is the object 1198 /* No point updating the players look faces if he is the object
1247 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1248 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1249 { 1219 {
1250 move_apply (tmp, op, NULL); 1220 move_apply (tmp, op, NULL);
1251 1221
1252 if (was_destroyed (op, tag)) 1222 if (op->destroyed ());
1253 {
1254 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1223 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1255 }
1256 } 1224 }
1257 1225
1258 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1259 1227
1260 if (tmp->above == tmp) 1228 if (tmp->above == tmp)
1288 * This function goes through all objects below and including top, and 1256 * This function goes through all objects below and including top, and
1289 * merges op to the first matching object. 1257 * merges op to the first matching object.
1290 * If top is NULL, it is calculated. 1258 * If top is NULL, it is calculated.
1291 * Returns pointer to object if it succeded in the merge, otherwise NULL 1259 * Returns pointer to object if it succeded in the merge, otherwise NULL
1292 */ 1260 */
1293
1294object * 1261object *
1295merge_ob (object *op, object *top) 1262merge_ob (object *op, object *top)
1296{ 1263{
1297 if (!op->nrof) 1264 if (!op->nrof)
1298 return 0; 1265 return 0;
1314 free_object (op); 1281 free_object (op);
1315 return top; 1282 return top;
1316 } 1283 }
1317 } 1284 }
1318 1285
1319 return NULL; 1286 return 0;
1320} 1287}
1321 1288
1322/* 1289/*
1323 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1290 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1324 * job preparing multi-part monsters 1291 * job preparing multi-part monsters
1325 */ 1292 */
1326object * 1293object *
1327insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1294insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1328{ 1295{
1329 object *tmp; 1296 object *tmp;
1330 1297
1331 if (op->head) 1298 if (op->head)
1332 op = op->head; 1299 op = op->head;
1360 * NULL if 'op' was destroyed 1327 * NULL if 'op' was destroyed
1361 * just 'op' otherwise 1328 * just 'op' otherwise
1362 */ 1329 */
1363 1330
1364object * 1331object *
1365insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1332insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1366{ 1333{
1367 object *tmp, *top, *floor = NULL; 1334 object *tmp, *top, *floor = NULL;
1368 sint16 x, y; 1335 sint16 x, y;
1369 1336
1370 if (QUERY_FLAG (op, FLAG_FREED)) 1337 if (QUERY_FLAG (op, FLAG_FREED))
1651 remove_ob (tmp); 1618 remove_ob (tmp);
1652 free_object (tmp); 1619 free_object (tmp);
1653 } 1620 }
1654 } 1621 }
1655 1622
1656 tmp1 = arch_to_object (find_archetype (arch_string)); 1623 tmp1 = arch_to_object (archetype::find (arch_string));
1657 1624
1658 tmp1->x = op->x; 1625 tmp1->x = op->x;
1659 tmp1->y = op->y; 1626 tmp1->y = op->y;
1660 insert_ob_in_map (tmp1, op->map, op, 0); 1627 insert_ob_in_map (tmp1, op->map, op, 0);
1661} 1628}
1960 */ 1927 */
1961 1928
1962int 1929int
1963check_move_on (object *op, object *originator) 1930check_move_on (object *op, object *originator)
1964{ 1931{
1965 object * 1932 object *tmp;
1966 tmp; 1933 maptile *m = op->map;
1967 tag_t
1968 tag;
1969 mapstruct *
1970 m = op->map;
1971 int
1972 x = op->x, y = op->y; 1934 int x = op->x, y = op->y;
1973 1935
1974 MoveType 1936 MoveType move_on, move_slow, move_block;
1975 move_on,
1976 move_slow,
1977 move_block;
1978 1937
1979 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1938 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1980 return 0; 1939 return 0;
1981
1982 tag = op->count;
1983 1940
1984 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1941 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1985 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1942 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1986 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1943 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1987 1944
2048 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 2005 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2049 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 2006 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2050 { 2007 {
2051 move_apply (tmp, op, originator); 2008 move_apply (tmp, op, originator);
2052 2009
2053 if (was_destroyed (op, tag)) 2010 if (op->destroyed ())
2054 return 1; 2011 return 1;
2055 2012
2056 /* what the person/creature stepped onto has moved the object 2013 /* what the person/creature stepped onto has moved the object
2057 * someplace new. Don't process any further - if we did, 2014 * someplace new. Don't process any further - if we did,
2058 * have a feeling strange problems would result. 2015 * have a feeling strange problems would result.
2070 * a matching archetype at the given map and coordinates. 2027 * a matching archetype at the given map and coordinates.
2071 * The first matching object is returned, or NULL if none. 2028 * The first matching object is returned, or NULL if none.
2072 */ 2029 */
2073 2030
2074object * 2031object *
2075present_arch (const archetype *at, mapstruct *m, int x, int y) 2032present_arch (const archetype *at, maptile *m, int x, int y)
2076{ 2033{
2077 object * 2034 object *
2078 tmp; 2035 tmp;
2079 2036
2080 if (m == NULL || out_of_map (m, x, y)) 2037 if (m == NULL || out_of_map (m, x, y))
2093 * a matching type variable at the given map and coordinates. 2050 * a matching type variable at the given map and coordinates.
2094 * The first matching object is returned, or NULL if none. 2051 * The first matching object is returned, or NULL if none.
2095 */ 2052 */
2096 2053
2097object * 2054object *
2098present (unsigned char type, mapstruct *m, int x, int y) 2055present (unsigned char type, maptile *m, int x, int y)
2099{ 2056{
2100 object * 2057 object *
2101 tmp; 2058 tmp;
2102 2059
2103 if (out_of_map (m, x, y)) 2060 if (out_of_map (m, x, y))
2243 * the archetype because that isn't correct if the monster has been 2200 * the archetype because that isn't correct if the monster has been
2244 * customized, changed states, etc. 2201 * customized, changed states, etc.
2245 */ 2202 */
2246 2203
2247int 2204int
2248find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2205find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2249{ 2206{
2250 int 2207 int
2251 i, 2208 i,
2252 index = 0, flag; 2209 index = 0, flag;
2253 static int 2210 static int
2274 return -1; 2231 return -1;
2275 return altern[RANDOM () % index]; 2232 return altern[RANDOM () % index];
2276} 2233}
2277 2234
2278/* 2235/*
2279 * find_first_free_spot(archetype, mapstruct, x, y) works like 2236 * find_first_free_spot(archetype, maptile, x, y) works like
2280 * find_free_spot(), but it will search max number of squares. 2237 * find_free_spot(), but it will search max number of squares.
2281 * But it will return the first available spot, not a random choice. 2238 * But it will return the first available spot, not a random choice.
2282 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2239 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2283 */ 2240 */
2284 2241
2285int 2242int
2286find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2243find_first_free_spot (const object *ob, maptile *m, int x, int y)
2287{ 2244{
2288 int 2245 int
2289 i; 2246 i;
2290 2247
2291 for (i = 0; i < SIZEOFFREE; i++) 2248 for (i = 0; i < SIZEOFFREE; i++)
2355 * because we have to know what movement the thing looking to move 2312 * because we have to know what movement the thing looking to move
2356 * there is capable of. 2313 * there is capable of.
2357 */ 2314 */
2358 2315
2359int 2316int
2360find_dir (mapstruct *m, int x, int y, object *exclude) 2317find_dir (maptile *m, int x, int y, object *exclude)
2361{ 2318{
2362 int 2319 int
2363 i, 2320 i,
2364 max = SIZEOFFREE, mflags; 2321 max = SIZEOFFREE, mflags;
2365 2322
2366 sint16 nx, ny; 2323 sint16 nx, ny;
2367 object * 2324 object *
2368 tmp; 2325 tmp;
2369 mapstruct * 2326 maptile *
2370 mp; 2327 mp;
2371 2328
2372 MoveType blocked, move_type; 2329 MoveType blocked, move_type;
2373 2330
2374 if (exclude && exclude->head) 2331 if (exclude && exclude->head)
2582 * Modified to be map tile aware -.MSW 2539 * Modified to be map tile aware -.MSW
2583 */ 2540 */
2584 2541
2585 2542
2586int 2543int
2587can_see_monsterP (mapstruct *m, int x, int y, int dir) 2544can_see_monsterP (maptile *m, int x, int y, int dir)
2588{ 2545{
2589 sint16 dx, dy; 2546 sint16 dx, dy;
2590 int 2547 int
2591 mflags; 2548 mflags;
2592 2549
2672 if (prev) 2629 if (prev)
2673 prev->more = tmp; 2630 prev->more = tmp;
2674 prev = tmp; 2631 prev = tmp;
2675 } 2632 }
2676 2633
2677 /*** copy inventory ***/
2678 for (item = src->inv; item; item = item->below) 2634 for (item = src->inv; item; item = item->below)
2679 {
2680 (void) insert_ob_in_ob (object_create_clone (item), dst); 2635 insert_ob_in_ob (object_create_clone (item), dst);
2681 }
2682 2636
2683 return dst; 2637 return dst;
2684} 2638}
2685 2639
2686/* return true if the object was destroyed, 0 otherwise */
2687int
2688was_destroyed (const object *op, tag_t old_tag)
2689{
2690 /* checking for FLAG_FREED isn't necessary, but makes this function more
2691 * robust */
2692 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2693}
2694
2695/* GROS - Creates an object using a string representing its content. */ 2640/* GROS - Creates an object using a string representing its content. */
2696
2697/* Basically, we save the content of the string to a temp file, then call */ 2641/* Basically, we save the content of the string to a temp file, then call */
2698
2699/* load_object on it. I admit it is a highly inefficient way to make things, */ 2642/* load_object on it. I admit it is a highly inefficient way to make things, */
2700
2701/* but it was simple to make and allows reusing the load_object function. */ 2643/* but it was simple to make and allows reusing the load_object function. */
2702
2703/* Remember not to use load_object_str in a time-critical situation. */ 2644/* Remember not to use load_object_str in a time-critical situation. */
2704
2705/* Also remember that multiparts objects are not supported for now. */ 2645/* Also remember that multiparts objects are not supported for now. */
2706 2646
2707object * 2647object *
2708load_object_str (const char *obstr) 2648load_object_str (const char *obstr)
2709{ 2649{
2710 object * 2650 object *op;
2711 op;
2712 char
2713 filename[MAX_BUF]; 2651 char filename[MAX_BUF];
2714 2652
2715 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2653 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2716 2654
2717 FILE *
2718 tempfile = fopen (filename, "w"); 2655 FILE *tempfile = fopen (filename, "w");
2719 2656
2720 if (tempfile == NULL) 2657 if (tempfile == NULL)
2721 { 2658 {
2722 LOG (llevError, "Error - Unable to access load object temp file\n"); 2659 LOG (llevError, "Error - Unable to access load object temp file\n");
2723 return NULL; 2660 return NULL;
2724 }; 2661 }
2662
2725 fprintf (tempfile, obstr); 2663 fprintf (tempfile, obstr);
2726 fclose (tempfile); 2664 fclose (tempfile);
2727 2665
2728 op = get_object (); 2666 op = get_object ();
2729 2667
2743 * returns NULL if no match. 2681 * returns NULL if no match.
2744 */ 2682 */
2745object * 2683object *
2746find_obj_by_type_subtype (const object *who, int type, int subtype) 2684find_obj_by_type_subtype (const object *who, int type, int subtype)
2747{ 2685{
2748 object * 2686 object *tmp;
2749 tmp;
2750 2687
2751 for (tmp = who->inv; tmp; tmp = tmp->below) 2688 for (tmp = who->inv; tmp; tmp = tmp->below)
2752 if (tmp->type == type && tmp->subtype == subtype) 2689 if (tmp->type == type && tmp->subtype == subtype)
2753 return tmp; 2690 return tmp;
2754 2691
2762 * do the desired thing. 2699 * do the desired thing.
2763 */ 2700 */
2764key_value * 2701key_value *
2765get_ob_key_link (const object *ob, const char *key) 2702get_ob_key_link (const object *ob, const char *key)
2766{ 2703{
2767 key_value * 2704 key_value *link;
2768 link;
2769 2705
2770 for (link = ob->key_values; link != NULL; link = link->next) 2706 for (link = ob->key_values; link != NULL; link = link->next)
2771 {
2772 if (link->key == key) 2707 if (link->key == key)
2773 {
2774 return link; 2708 return link;
2775 }
2776 }
2777 2709
2778 return NULL; 2710 return NULL;
2779} 2711}
2780 2712
2781/* 2713/*
2786 * The returned string is shared. 2718 * The returned string is shared.
2787 */ 2719 */
2788const char * 2720const char *
2789get_ob_key_value (const object *op, const char *const key) 2721get_ob_key_value (const object *op, const char *const key)
2790{ 2722{
2791 key_value * 2723 key_value *link;
2792 link; 2724 shstr_cmp canonical_key (key);
2793 const char *
2794 canonical_key;
2795 2725
2796 canonical_key = shstr::find (key);
2797
2798 if (canonical_key == NULL) 2726 if (!canonical_key)
2799 { 2727 {
2800 /* 1. There being a field named key on any object 2728 /* 1. There being a field named key on any object
2801 * implies there'd be a shared string to find. 2729 * implies there'd be a shared string to find.
2802 * 2. Since there isn't, no object has this field. 2730 * 2. Since there isn't, no object has this field.
2803 * 3. Therefore, *this* object doesn't have this field. 2731 * 3. Therefore, *this* object doesn't have this field.
2804 */ 2732 */
2805 return NULL; 2733 return 0;
2806 } 2734 }
2807 2735
2808 /* This is copied from get_ob_key_link() above - 2736 /* This is copied from get_ob_key_link() above -
2809 * only 4 lines, and saves the function call overhead. 2737 * only 4 lines, and saves the function call overhead.
2810 */ 2738 */
2811 for (link = op->key_values; link != NULL; link = link->next) 2739 for (link = op->key_values; link; link = link->next)
2812 {
2813 if (link->key == canonical_key) 2740 if (link->key == canonical_key)
2814 {
2815 return link->value; 2741 return link->value;
2816 } 2742
2817 }
2818 return NULL; 2743 return 0;
2819} 2744}
2820 2745
2821 2746
2822/* 2747/*
2823 * Updates the canonical_key in op to value. 2748 * Updates the canonical_key in op to value.
2908{ 2833{
2909 shstr key_ (key); 2834 shstr key_ (key);
2910 2835
2911 return set_ob_key_value_s (op, key_, value, add_key); 2836 return set_ob_key_value_s (op, key_, value, add_key);
2912} 2837}
2838
2839object::depth_iterator::depth_iterator (object *container)
2840: iterator_base (container)
2841{
2842 while (item->inv)
2843 item = item->inv;
2844}
2845
2846void
2847object::depth_iterator::next ()
2848{
2849 if (item->below)
2850 {
2851 item = item->below;
2852
2853 while (item->inv)
2854 item = item->inv;
2855 }
2856 else
2857 item = item->env;
2858}
2859
2860// return a suitable string describing an objetc in enough detail to find it
2861const char *
2862object::debug_desc (char *info) const
2863{
2864 char info2[256 * 3];
2865 char *p = info;
2866
2867 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2868 count,
2869 &name,
2870 title ? " " : "",
2871 title ? (const char *)title : "");
2872
2873 if (env)
2874 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2875
2876 if (map)
2877 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2878
2879 return info;
2880}
2881
2882const char *
2883object::debug_desc () const
2884{
2885 static char info[256 * 3];
2886 return debug_desc (info);
2887}
2888

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines