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.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.37 by root, Tue Sep 12 20:55:40 2006 UTC

1
2/*
3 * static char *rcsid_object_c =
4 * "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5 */
6 1
7/* 2/*
8 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
9 4
10 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
… …
29 24
30/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
32 variable. */ 27 variable. */
33#include <global.h> 28#include <global.h>
34#ifndef WIN32 /* ---win32 exclude headers */
35# include <stdio.h> 29#include <stdio.h>
36# include <sys/types.h> 30#include <sys/types.h>
37# include <sys/uio.h> 31#include <sys/uio.h>
38#endif /* win32 */
39#include <object.h> 32#include <object.h>
40#include <funcpoint.h> 33#include <funcpoint.h>
41#include <skills.h>
42#include <loader.h> 34#include <loader.h>
35
43int nrofallocobjects = 0; 36int nrofallocobjects = 0;
44 37
45object *objects; /* Pointer to the list of used objects */ 38object *objects; /* Pointer to the list of used objects */
46object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
47 40
… …
214 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 207 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215 return 0; 208 return 0;
216 209
217 switch (ob1->type) 210 switch (ob1->type)
218 { 211 {
219 case SCROLL: 212 case SCROLL:
220 if (ob1->level != ob2->level) 213 if (ob1->level != ob2->level)
221 return 0; 214 return 0;
222 break; 215 break;
223 } 216 }
224 217
225 if (ob1->key_values != NULL || ob2->key_values != NULL) 218 if (ob1->key_values != NULL || ob2->key_values != NULL)
226 { 219 {
227 /* At least one of these has key_values. */ 220 /* At least one of these has key_values. */
… …
249/* 242/*
250 * sum_weight() is a recursive function which calculates the weight 243 * sum_weight() is a recursive function which calculates the weight
251 * an object is carrying. It goes through in figures out how much 244 * an object is carrying. It goes through in figures out how much
252 * containers are carrying, and sums it up. 245 * containers are carrying, and sums it up.
253 */ 246 */
254signed long 247long
255sum_weight (object *op) 248sum_weight (object *op)
256{ 249{
257 signed long sum; 250 long sum;
258 object *inv; 251 object *inv;
259 252
260 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 253 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261 { 254 {
262 if (inv->inv) 255 if (inv->inv)
263 sum_weight (inv); 256 sum_weight (inv);
264 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265 } 258 }
259
266 if (op->type == CONTAINER && op->stats.Str) 260 if (op->type == CONTAINER && op->stats.Str)
267 sum = (sum * (100 - op->stats.Str)) / 100; 261 sum = (sum * (100 - op->stats.Str)) / 100;
262
268 if (op->carrying != sum) 263 if (op->carrying != sum)
269 op->carrying = sum; 264 op->carrying = sum;
265
270 return sum; 266 return sum;
271} 267}
272 268
273/** 269/**
274 * Return the outermost environment object for a given object. 270 * Return the outermost environment object for a given object.
… …
423 */ 419 */
424 420
425object * 421object *
426find_object_name (const char *str) 422find_object_name (const char *str)
427{ 423{
428 const char *name = shstr::find (str); 424 shstr_cmp str_ (str);
429 object *op; 425 object *op;
430 426
431 for (op = objects; op != NULL; op = op->next) 427 for (op = objects; op != NULL; op = op->next)
432 if (&op->name == name) 428 if (op->name == str_)
433 break; 429 break;
434 430
435 return op; 431 return op;
436} 432}
437 433
… …
449 * Changed 2004-02-12 - if the player is setting at the play again 445 * Changed 2004-02-12 - if the player is setting at the play again
450 * prompt, he is removed, and we don't want to treat him as an owner of 446 * prompt, he is removed, and we don't want to treat him as an owner of
451 * anything, so check removed flag. I don't expect that this should break 447 * anything, so check removed flag. I don't expect that this should break
452 * anything - once an object is removed, it is basically dead anyways. 448 * anything - once an object is removed, it is basically dead anyways.
453 */ 449 */
454
455object * 450object *
456get_owner (object *op) 451object::get_owner ()
457{ 452{
458 if (op->owner == NULL) 453 if (!owner
459 return NULL; 454 || QUERY_FLAG (owner, FLAG_FREED)
455 || QUERY_FLAG (owner, FLAG_REMOVED))
456 owner = 0;
460 457
461 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462 return op->owner; 458 return owner;
463
464 op->owner = NULL;
465 op->ownercount = 0;
466 return NULL;
467}
468
469void
470clear_owner (object *op)
471{
472 if (!op)
473 return;
474
475 if (op->owner && op->ownercount == op->owner->count)
476 op->owner->refcount--;
477
478 op->owner = NULL;
479 op->ownercount = 0;
480} 459}
481 460
482/* 461/*
483 * Sets the owner and sets the skill and exp pointers to owner's current 462 * Sets the owner and sets the skill and exp pointers to owner's current
484 * skill and experience objects. 463 * skill and experience objects.
485 */ 464 */
486void 465void
487set_owner (object *op, object *owner) 466object::set_owner (object *owner)
488{ 467{
489 if (owner == NULL || op == NULL) 468 if (!owner)
490 return; 469 return;
491 470
492 /* next line added to allow objects which own objects */ 471 /* next line added to allow objects which own objects */
493 /* Add a check for ownercounts in here, as I got into an endless loop 472 /* Add a check for ownercounts in here, as I got into an endless loop
494 * with the fireball owning a poison cloud which then owned the 473 * with the fireball owning a poison cloud which then owned the
495 * fireball. I believe that was caused by one of the objects getting 474 * fireball. I believe that was caused by one of the objects getting
496 * freed and then another object replacing it. Since the ownercounts 475 * freed and then another object replacing it. Since the ownercounts
497 * didn't match, this check is valid and I believe that cause is valid. 476 * didn't match, this check is valid and I believe that cause is valid.
498 */ 477 */
499 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 478 while (owner->owner)
500 owner = owner->owner; 479 owner = owner->owner;
501 480
502 /* IF the owner still has an owner, we did not resolve to a final owner.
503 * so lets not add to that.
504 */
505 if (owner->owner)
506 return;
507
508 op->owner = owner; 481 this->owner = owner;
509
510 op->ownercount = owner->count;
511 owner->refcount++;
512}
513
514/* Set the owner to clone's current owner and set the skill and experience
515 * objects to clone's objects (typically those objects that where the owner's
516 * current skill and experience objects at the time when clone's owner was
517 * set - not the owner's current skill and experience objects).
518 *
519 * Use this function if player created an object (e.g. fire bullet, swarm
520 * spell), and this object creates further objects whose kills should be
521 * accounted for the player's original skill, even if player has changed
522 * skills meanwhile.
523 */
524void
525copy_owner (object *op, object *clone)
526{
527 object *owner = get_owner (clone);
528
529 if (owner == NULL)
530 {
531 /* players don't have owners - they own themselves. Update
532 * as appropriate.
533 */
534 if (clone->type == PLAYER)
535 owner = clone;
536 else
537 return;
538 }
539
540 set_owner (op, owner);
541} 482}
542 483
543/* Zero the key_values on op, decrementing the shared-string 484/* Zero the key_values on op, decrementing the shared-string
544 * refcounts and freeing the links. 485 * refcounts and freeing the links.
545 */ 486 */
… …
561{ 502{
562 attachable_base::clear (); 503 attachable_base::clear ();
563 504
564 free_key_values (this); 505 free_key_values (this);
565 506
566 clear_owner (this); 507 owner = 0;
567
568 name = 0; 508 name = 0;
569 name_pl = 0; 509 name_pl = 0;
570 title = 0; 510 title = 0;
571 race = 0; 511 race = 0;
572 slaying = 0; 512 slaying = 0;
573 skill = 0; 513 skill = 0;
574 msg = 0; 514 msg = 0;
575 lore = 0; 515 lore = 0;
576 custom_name = 0; 516 custom_name = 0;
577 materialname = 0; 517 materialname = 0;
518 contr = 0;
519 below = 0;
520 above = 0;
521 inv = 0;
522 container = 0;
523 env = 0;
524 more = 0;
525 head = 0;
526 map = 0;
527 active_next = 0;
528 active_prev = 0;
578 529
579 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 530 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580 531
581 SET_FLAG (this, FLAG_REMOVED); 532 SET_FLAG (this, FLAG_REMOVED);
533
534 /* What is not cleared is next, prev, and count */
535
536 expmul = 1.0;
537 face = blank_face;
538 attacked_by_count = -1;
539
540 if (settings.casting_time)
541 casting_time = -1;
582} 542}
583 543
584void object::clone (object *destination) 544void object::clone (object *destination)
585{ 545{
586 *(object_copy *) destination = *this; 546 *(object_copy *)destination = *this;
587 *(object_pod *) destination = *this; 547 *(object_pod *)destination = *this;
588 548
589 if (self || cb) 549 if (self || cb)
590 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 550 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591}
592
593/*
594 * clear_object() frees everything allocated by an object, and also
595 * clears all variables and flags to default settings.
596 */
597
598void
599clear_object (object *op)
600{
601 op->clear ();
602
603 op->contr = NULL;
604 op->below = NULL;
605 op->above = NULL;
606 op->inv = NULL;
607 op->container = NULL;
608 op->env = NULL;
609 op->more = NULL;
610 op->head = NULL;
611 op->map = NULL;
612 op->refcount = 0;
613 op->active_next = NULL;
614 op->active_prev = NULL;
615 /* What is not cleared is next, prev, and count */
616
617 op->expmul = 1.0;
618 op->face = blank_face;
619 op->attacked_by_count = -1;
620
621 if (settings.casting_time)
622 op->casting_time = -1;
623} 551}
624 552
625/* 553/*
626 * copy object first frees everything allocated by the second object, 554 * copy object first frees everything allocated by the second object,
627 * and then copies the contends of the first object into the second 555 * and then copies the contends of the first object into the second
628 * object, allocating what needs to be allocated. Basically, any 556 * object, allocating what needs to be allocated. Basically, any
629 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 557 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
630 * if the first object is freed, the pointers in the new object 558 * if the first object is freed, the pointers in the new object
631 * will point at garbage. 559 * will point at garbage.
632 */ 560 */
633
634void 561void
635copy_object (object *op2, object *op) 562copy_object (object *op2, object *op)
636{ 563{
637 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 564 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 565 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
… …
698/* 625/*
699 * Updates the speed of an object. If the speed changes from 0 to another 626 * Updates the speed of an object. If the speed changes from 0 to another
700 * value, or vice versa, then add/remove the object from the active list. 627 * value, or vice versa, then add/remove the object from the active list.
701 * This function needs to be called whenever the speed of an object changes. 628 * This function needs to be called whenever the speed of an object changes.
702 */ 629 */
703
704void 630void
705update_ob_speed (object *op) 631update_ob_speed (object *op)
706{ 632{
707 extern int arch_init; 633 extern int arch_init;
708 634
… …
717 abort (); 643 abort ();
718#else 644#else
719 op->speed = 0; 645 op->speed = 0;
720#endif 646#endif
721 } 647 }
648
722 if (arch_init) 649 if (arch_init)
723 {
724 return; 650 return;
725 } 651
726 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 652 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727 { 653 {
728 /* If already on active list, don't do anything */ 654 /* If already on active list, don't do anything */
729 if (op->active_next || op->active_prev || op == active_objects) 655 if (op->active_next || op->active_prev || op == active_objects)
730 return; 656 return;
731 657
732 /* process_events() expects us to insert the object at the beginning 658 /* process_events() expects us to insert the object at the beginning
733 * of the list. */ 659 * of the list. */
734 op->active_next = active_objects; 660 op->active_next = active_objects;
661
735 if (op->active_next != NULL) 662 if (op->active_next != NULL)
736 op->active_next->active_prev = op; 663 op->active_next->active_prev = op;
664
737 active_objects = op; 665 active_objects = op;
738 } 666 }
739 else 667 else
740 { 668 {
741 /* If not on the active list, nothing needs to be done */ 669 /* If not on the active list, nothing needs to be done */
… …
743 return; 671 return;
744 672
745 if (op->active_prev == NULL) 673 if (op->active_prev == NULL)
746 { 674 {
747 active_objects = op->active_next; 675 active_objects = op->active_next;
676
748 if (op->active_next != NULL) 677 if (op->active_next != NULL)
749 op->active_next->active_prev = NULL; 678 op->active_next->active_prev = NULL;
750 } 679 }
751 else 680 else
752 { 681 {
753 op->active_prev->active_next = op->active_next; 682 op->active_prev->active_next = op->active_next;
683
754 if (op->active_next) 684 if (op->active_next)
755 op->active_next->active_prev = op->active_prev; 685 op->active_next->active_prev = op->active_prev;
756 } 686 }
687
757 op->active_next = NULL; 688 op->active_next = NULL;
758 op->active_prev = NULL; 689 op->active_prev = NULL;
759 } 690 }
760} 691}
761 692
… …
891 /* if the object is being removed, we can't make intelligent 822 /* if the object is being removed, we can't make intelligent
892 * decisions, because remove_ob can't really pass the object 823 * decisions, because remove_ob can't really pass the object
893 * that is being removed. 824 * that is being removed.
894 */ 825 */
895 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 826 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896 {
897 update_now = 1; 827 update_now = 1;
898 }
899 else if (action == UP_OBJ_FACE) 828 else if (action == UP_OBJ_FACE)
900 {
901 /* Nothing to do for that case */ 829 /* Nothing to do for that case */ ;
902 }
903 else 830 else
904 {
905 LOG (llevError, "update_object called with invalid action: %d\n", action); 831 LOG (llevError, "update_object called with invalid action: %d\n", action);
906 }
907 832
908 if (update_now) 833 if (update_now)
909 { 834 {
910 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); 835 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911 update_position (op->map, op->x, op->y); 836 update_position (op->map, op->x, op->y);
… …
914 if (op->more != NULL) 839 if (op->more != NULL)
915 update_object (op->more, action); 840 update_object (op->more, action);
916} 841}
917 842
918static unordered_vector<object *> mortals; 843static unordered_vector<object *> mortals;
919static std::vector<object *> freed; 844static std::vector<object *, slice_allocator <object *> > freed;
920 845
921void object::free_mortals () 846void object::free_mortals ()
922{ 847{
923 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) 848 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924 if (!(*i)->refcount) 849 if ((*i)->refcnt)
850 ++i; // further delay freeing
851 else
925 { 852 {
926 freed.push_back (*i); 853 freed.push_back (*i);//D
854 //delete *i;
927 mortals.erase (i); 855 mortals.erase (i);
928 } 856 }
929 else 857
930 ++i; 858 if (mortals.size() && 0)//D
859 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
931} 860}
932 861
933object::object () 862object::object ()
934{ 863{
935 SET_FLAG (this, FLAG_REMOVED); 864 SET_FLAG (this, FLAG_REMOVED);
… …
985 if (freed.empty ()) 914 if (freed.empty ())
986 op = new object; 915 op = new object;
987 else 916 else
988 { 917 {
989 // highly annoying, but the only way to get it stable right now 918 // highly annoying, but the only way to get it stable right now
990 op = freed.back (); freed.pop_back (); 919 op = freed.back ();
920 freed.pop_back ();
991 op->~object (); 921 op->~object ();
992 new ((void *)op) object; 922 new ((void *) op) object;
993 } 923 }
994 924
995 op->link (); 925 op->link ();
996 return op; 926 return op;
997} 927}
… …
1006 * If free_inventory is set, free inventory as well. Else drop items in 936 * If free_inventory is set, free inventory as well. Else drop items in
1007 * inventory to the ground. 937 * inventory to the ground.
1008 */ 938 */
1009void object::free (bool free_inventory) 939void object::free (bool free_inventory)
1010{ 940{
941 if (QUERY_FLAG (this, FLAG_FREED))
942 return;
943
944 if (QUERY_FLAG (this, FLAG_FRIENDLY))
945 remove_friendly_object (this);
946
1011 if (!QUERY_FLAG (this, FLAG_REMOVED)) 947 if (!QUERY_FLAG (this, FLAG_REMOVED))
1012 { 948 remove_ob (this);
1013 LOG (llevDebug, "Free object called with non removed object\n");
1014 dump_object (this);
1015#ifdef MANY_CORES
1016 abort ();
1017#endif
1018 }
1019 949
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021 {
1022 LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023 remove_friendly_object (this);
1024 }
1025
1026 if (QUERY_FLAG (this, FLAG_FREED)) 950 SET_FLAG (this, FLAG_FREED);
1027 {
1028 dump_object (this);
1029 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030 return;
1031 }
1032 951
1033 if (more) 952 if (more)
1034 { 953 {
1035 more->free (free_inventory); 954 more->free (free_inventory);
1036 more = 0; 955 more = 0;
… …
1040 { 959 {
1041 /* Only if the space blocks everything do we not process - 960 /* Only if the space blocks everything do we not process -
1042 * if some form of movement is allowed, let objects 961 * if some form of movement is allowed, let objects
1043 * drop on that space. 962 * drop on that space.
1044 */ 963 */
1045 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 964 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1046 { 965 {
1047 object * 966 object *op = inv;
1048 op = inv;
1049 967
1050 while (op) 968 while (op)
1051 { 969 {
1052 object *
1053 tmp = op->below; 970 object *tmp = op->below;
1054
1055 remove_ob (op);
1056 op->free (free_inventory); 971 op->free (free_inventory);
1057 op = tmp; 972 op = tmp;
1058 } 973 }
1059 } 974 }
1060 else 975 else
1061 { /* Put objects in inventory onto this space */ 976 { /* Put objects in inventory onto this space */
1062 object * 977 object *op = inv;
1063 op = inv;
1064 978
1065 while (op) 979 while (op)
1066 { 980 {
1067 object *
1068 tmp = op->below; 981 object *tmp = op->below;
1069 982
1070 remove_ob (op); 983 remove_ob (op);
1071 984
1072 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 985 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 986 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
1082 op = tmp; 995 op = tmp;
1083 } 996 }
1084 } 997 }
1085 } 998 }
1086 999
1087 clear_owner (this); 1000 owner = 0;
1088 1001
1089 /* Remove object from the active list */ 1002 /* Remove object from the active list */
1090 speed = 0; 1003 speed = 0;
1091 update_ob_speed (this); 1004 update_ob_speed (this);
1092 1005
1093 unlink (); 1006 unlink ();
1094
1095 SET_FLAG (this, FLAG_FREED);
1096 1007
1097 mortals.push_back (this); 1008 mortals.push_back (this);
1098} 1009}
1099 1010
1100/* 1011/*
… …
1131 object * 1042 object *
1132 tmp, * 1043 tmp, *
1133 last = NULL; 1044 last = NULL;
1134 object * 1045 object *
1135 otmp; 1046 otmp;
1047
1136 tag_t 1048 tag_t
1137 tag; 1049 tag;
1138 int 1050 int
1139 check_walk_off; 1051 check_walk_off;
1140 mapstruct * 1052 mapstruct *
1141 m; 1053 m;
1054
1142 sint16 1055 sint16
1143 x, 1056 x,
1144 y; 1057 y;
1145 1058
1146
1147 if (QUERY_FLAG (op, FLAG_REMOVED)) 1059 if (QUERY_FLAG (op, FLAG_REMOVED))
1148 { 1060 return;
1149 dump_object (op);
1150 LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151 1061
1152 /* Changed it to always dump core in this case. As has been learned 1062 SET_FLAG (op, FLAG_REMOVED);
1153 * in the past, trying to recover from errors almost always 1063
1154 * make things worse, and this is a real error here - something
1155 * that should not happen.
1156 * Yes, if this was a mission critical app, trying to do something
1157 * to recover may make sense, but that is because failure of the app
1158 * may have other disastrous problems. Cf runs out of a script
1159 * so is easily enough restarted without any real problems.
1160 * MSW 2001-07-01
1161 */
1162 abort ();
1163 }
1164 if (op->more != NULL) 1064 if (op->more != NULL)
1165 remove_ob (op->more); 1065 remove_ob (op->more);
1166
1167 SET_FLAG (op, FLAG_REMOVED);
1168 1066
1169 /* 1067 /*
1170 * In this case, the object to be removed is in someones 1068 * In this case, the object to be removed is in someones
1171 * inventory. 1069 * inventory.
1172 */ 1070 */
… …
1198 */ 1096 */
1199 op->x = op->env->x, op->y = op->env->y; 1097 op->x = op->env->x, op->y = op->env->y;
1200 op->map = op->env->map; 1098 op->map = op->env->map;
1201 op->above = NULL, op->below = NULL; 1099 op->above = NULL, op->below = NULL;
1202 op->env = NULL; 1100 op->env = NULL;
1203 return; 1101 }
1102 else if (op->map)
1204 } 1103 {
1205
1206 /* If we get here, we are removing it from a map */
1207 if (op->map == NULL)
1208 return;
1209
1210 x = op->x; 1104 x = op->x;
1211 y = op->y; 1105 y = op->y;
1212 m = get_map_from_coord (op->map, &x, &y); 1106 m = get_map_from_coord (op->map, &x, &y);
1213 1107
1214 if (!m) 1108 if (!m)
1215 { 1109 {
1216 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1110 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217 op->map->path, op->x, op->y); 1111 op->map->path, op->x, op->y);
1218 /* in old days, we used to set x and y to 0 and continue. 1112 /* in old days, we used to set x and y to 0 and continue.
1219 * it seems if we get into this case, something is probablye 1113 * it seems if we get into this case, something is probablye
1220 * screwed up and should be fixed. 1114 * screwed up and should be fixed.
1115 */
1116 abort ();
1117 }
1118
1119 if (op->map != m)
1120 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121 op->map->path, m->path, op->x, op->y, x, y);
1122
1123 /* Re did the following section of code - it looks like it had
1124 * lots of logic for things we no longer care about
1221 */ 1125 */
1222 abort ();
1223 }
1224 if (op->map != m)
1225 {
1226 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227 op->map->path, m->path, op->x, op->y, x, y);
1228 }
1229 1126
1230 /* Re did the following section of code - it looks like it had
1231 * lots of logic for things we no longer care about
1232 */
1233
1234 /* link the object above us */ 1127 /* link the object above us */
1235 if (op->above) 1128 if (op->above)
1236 op->above->below = op->below; 1129 op->above->below = op->below;
1237 else 1130 else
1238 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1131 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239 1132
1240 /* Relink the object below us, if there is one */ 1133 /* Relink the object below us, if there is one */
1241 if (op->below) 1134 if (op->below)
1242 {
1243 op->below->above = op->above; 1135 op->below->above = op->above;
1244 }
1245 else 1136 else
1246 { 1137 {
1247 /* Nothing below, which means we need to relink map object for this space 1138 /* Nothing below, which means we need to relink map object for this space
1248 * use translated coordinates in case some oddness with map tiling is 1139 * use translated coordinates in case some oddness with map tiling is
1249 * evident 1140 * evident
1250 */
1251 if (GET_MAP_OB (m, x, y) != op)
1252 {
1253 dump_object (op);
1254 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",
1255 errmsg);
1256 dump_object (GET_MAP_OB (m, x, y));
1257 LOG (llevError, "%s\n", errmsg);
1258 }
1259 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260 }
1261 op->above = NULL;
1262 op->below = NULL;
1263
1264 if (op->map->in_memory == MAP_SAVING)
1265 return;
1266
1267 tag = op->count;
1268 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270 {
1271 /* No point updating the players look faces if he is the object
1272 * being removed.
1273 */
1274
1275 if (tmp->type == PLAYER && tmp != op)
1276 {
1277 /* If a container that the player is currently using somehow gets
1278 * removed (most likely destroyed), update the player view
1279 * appropriately.
1280 */ 1141 */
1281 if (tmp->container == op) 1142 if (GET_MAP_OB (m, x, y) != op)
1282 { 1143 {
1283 CLEAR_FLAG (op, FLAG_APPLIED); 1144 dump_object (op);
1284 tmp->container = NULL; 1145 LOG (llevError,
1146 "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);
1147 dump_object (GET_MAP_OB (m, x, y));
1148 LOG (llevError, "%s\n", errmsg);
1285 } 1149 }
1286 tmp->contr->socket.update_look = 1; 1150
1287 } 1151 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288 /* See if player moving off should effect something */
1289 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290 { 1152 }
1291 1153
1292 move_apply (tmp, op, NULL); 1154 op->above = 0;
1293 if (was_destroyed (op, tag)) 1155 op->below = 0;
1156
1157 if (op->map->in_memory == MAP_SAVING)
1158 return;
1159
1160 tag = op->count;
1161 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1162
1163 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1164 {
1165 /* No point updating the players look faces if he is the object
1166 * being removed.
1167 */
1168
1169 if (tmp->type == PLAYER && tmp != op)
1294 { 1170 {
1295 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1171 /* If a container that the player is currently using somehow gets
1172 * removed (most likely destroyed), update the player view
1173 * appropriately.
1174 */
1175 if (tmp->container == op)
1176 {
1177 CLEAR_FLAG (op, FLAG_APPLIED);
1178 tmp->container = NULL;
1179 }
1180
1181 tmp->contr->socket.update_look = 1;
1296 } 1182 }
1183
1184 /* See if player moving off should effect something */
1185 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186 {
1187 move_apply (tmp, op, NULL);
1188
1189 if (was_destroyed (op, tag))
1190 {
1191 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1192 }
1297 } 1193 }
1298 1194
1299 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1195 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300 1196
1301 if (tmp->above == tmp) 1197 if (tmp->above == tmp)
1302 tmp->above = NULL; 1198 tmp->above = NULL;
1199
1303 last = tmp; 1200 last = tmp;
1304 } 1201 }
1202
1305 /* last == NULL of there are no objects on this space */ 1203 /* last == NULL of there are no objects on this space */
1306 if (last == NULL) 1204 if (last == NULL)
1307 { 1205 {
1308 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1206 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1207 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310 * those out anyways, and if there are any flags set right now, they won't 1208 * those out anyways, and if there are any flags set right now, they won't
1311 * be correct anyways. 1209 * be correct anyways.
1312 */ 1210 */
1313 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1211 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314 update_position (op->map, op->x, op->y); 1212 update_position (op->map, op->x, op->y);
1315 } 1213 }
1316 else 1214 else
1317 update_object (last, UP_OBJ_REMOVE); 1215 update_object (last, UP_OBJ_REMOVE);
1318 1216
1319 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1217 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1320 update_all_los (op->map, op->x, op->y); 1218 update_all_los (op->map, op->x, op->y);
1321 1219 }
1322} 1220}
1323 1221
1324/* 1222/*
1325 * merge_ob(op,top): 1223 * merge_ob(op,top):
1326 * 1224 *
1327 * This function goes through all objects below and including top, and 1225 * This function goes through all objects below and including top, and
1328 * merges op to the first matching object. 1226 * merges op to the first matching object.
1329 * If top is NULL, it is calculated. 1227 * If top is NULL, it is calculated.
1330 * Returns pointer to object if it succeded in the merge, otherwise NULL 1228 * Returns pointer to object if it succeded in the merge, otherwise NULL
1331 */ 1229 */
1332
1333object * 1230object *
1334merge_ob (object *op, object *top) 1231merge_ob (object *op, object *top)
1335{ 1232{
1336 if (!op->nrof) 1233 if (!op->nrof)
1337 return 0; 1234 return 0;
1235
1338 if (top == NULL) 1236 if (top == NULL)
1339 for (top = op; top != NULL && top->above != NULL; top = top->above); 1237 for (top = op; top != NULL && top->above != NULL; top = top->above);
1238
1340 for (; top != NULL; top = top->below) 1239 for (; top != NULL; top = top->below)
1341 { 1240 {
1342 if (top == op) 1241 if (top == op)
1343 continue; 1242 continue;
1344 if (CAN_MERGE (op, top)) 1243 if (CAN_MERGE (op, top))
… …
1350 remove_ob (op); 1249 remove_ob (op);
1351 free_object (op); 1250 free_object (op);
1352 return top; 1251 return top;
1353 } 1252 }
1354 } 1253 }
1254
1355 return NULL; 1255 return NULL;
1356} 1256}
1357 1257
1358/* 1258/*
1359 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1259 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1360 * job preparing multi-part monsters 1260 * job preparing multi-part monsters
1361 */ 1261 */
1362object * 1262object *
1363insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1263insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1364{ 1264{
1365 object * 1265 object *tmp;
1366 tmp;
1367 1266
1368 if (op->head) 1267 if (op->head)
1369 op = op->head; 1268 op = op->head;
1269
1370 for (tmp = op; tmp; tmp = tmp->more) 1270 for (tmp = op; tmp; tmp = tmp->more)
1371 { 1271 {
1372 tmp->x = x + tmp->arch->clone.x; 1272 tmp->x = x + tmp->arch->clone.x;
1373 tmp->y = y + tmp->arch->clone.y; 1273 tmp->y = y + tmp->arch->clone.y;
1374 } 1274 }
1275
1375 return insert_ob_in_map (op, m, originator, flag); 1276 return insert_ob_in_map (op, m, originator, flag);
1376} 1277}
1377 1278
1378/* 1279/*
1379 * insert_ob_in_map (op, map, originator, flag): 1280 * insert_ob_in_map (op, map, originator, flag):
… …
1438 1339
1439 if (op->more != NULL) 1340 if (op->more != NULL)
1440 { 1341 {
1441 /* The part may be on a different map. */ 1342 /* The part may be on a different map. */
1442 1343
1443 object *
1444 more = op->more; 1344 object *more = op->more;
1445 1345
1446 /* We really need the caller to normalize coordinates - if 1346 /* We really need the caller to normalize coordinates - if
1447 * we set the map, that doesn't work if the location is within 1347 * we set the map, that doesn't work if the location is within
1448 * a map and this is straddling an edge. So only if coordinate 1348 * a map and this is straddling an edge. So only if coordinate
1449 * is clear wrong do we normalize it. 1349 * is clear wrong do we normalize it.
1450 */ 1350 */
1451 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1351 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452 {
1453 more->map = get_map_from_coord (m, &more->x, &more->y); 1352 more->map = get_map_from_coord (m, &more->x, &more->y);
1454 }
1455 else if (!more->map) 1353 else if (!more->map)
1456 { 1354 {
1457 /* For backwards compatibility - when not dealing with tiled maps, 1355 /* For backwards compatibility - when not dealing with tiled maps,
1458 * more->map should always point to the parent. 1356 * more->map should always point to the parent.
1459 */ 1357 */
… …
1462 1360
1463 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1361 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464 { 1362 {
1465 if (!op->head) 1363 if (!op->head)
1466 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1364 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1365
1467 return NULL; 1366 return NULL;
1468 } 1367 }
1469 } 1368 }
1470 1369
1471 CLEAR_FLAG (op, FLAG_REMOVED); 1370 CLEAR_FLAG (op, FLAG_REMOVED);
… …
1536 1435
1537 while (top != NULL) 1436 while (top != NULL)
1538 { 1437 {
1539 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1438 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540 floor = top; 1439 floor = top;
1440
1541 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1441 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542 { 1442 {
1543 /* We insert above top, so we want this object below this */ 1443 /* We insert above top, so we want this object below this */
1544 top = top->below; 1444 top = top->below;
1545 break; 1445 break;
1546 } 1446 }
1447
1547 last = top; 1448 last = top;
1548 top = top->above; 1449 top = top->above;
1549 } 1450 }
1451
1550 /* Don't want top to be NULL, so set it to the last valid object */ 1452 /* Don't want top to be NULL, so set it to the last valid object */
1551 top = last; 1453 top = last;
1552 1454
1553 /* We let update_position deal with figuring out what the space 1455 /* We let update_position deal with figuring out what the space
1554 * looks like instead of lots of conditions here. 1456 * looks like instead of lots of conditions here.
… …
1633 * of effect may be sufficient. 1535 * of effect may be sufficient.
1634 */ 1536 */
1635 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1537 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636 update_all_los (op->map, op->x, op->y); 1538 update_all_los (op->map, op->x, op->y);
1637 1539
1638
1639 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1540 /* updates flags (blocked, alive, no magic, etc) for this map space */
1640 update_object (op, UP_OBJ_INSERT); 1541 update_object (op, UP_OBJ_INSERT);
1641
1642 1542
1643 /* Don't know if moving this to the end will break anything. However, 1543 /* Don't know if moving this to the end will break anything. However,
1644 * we want to have update_look set above before calling this. 1544 * we want to have update_look set above before calling this.
1645 * 1545 *
1646 * check_move_on() must be after this because code called from 1546 * check_move_on() must be after this because code called from
… …
1671 * op is the object to insert it under: supplies x and the map. 1571 * op is the object to insert it under: supplies x and the map.
1672 */ 1572 */
1673void 1573void
1674replace_insert_ob_in_map (const char *arch_string, object *op) 1574replace_insert_ob_in_map (const char *arch_string, object *op)
1675{ 1575{
1676 object *tmp; 1576 object *
1577 tmp;
1677 object *tmp1; 1578 object *
1579 tmp1;
1678 1580
1679 /* first search for itself and remove any old instances */ 1581 /* first search for itself and remove any old instances */
1680 1582
1681 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1583 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682 { 1584 {
… …
1713 if (orig_ob->nrof < nr) 1615 if (orig_ob->nrof < nr)
1714 { 1616 {
1715 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1617 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716 return NULL; 1618 return NULL;
1717 } 1619 }
1620
1718 newob = object_create_clone (orig_ob); 1621 newob = object_create_clone (orig_ob);
1622
1719 if ((orig_ob->nrof -= nr) < 1) 1623 if ((orig_ob->nrof -= nr) < 1)
1720 { 1624 {
1721 if (!is_removed) 1625 if (!is_removed)
1722 remove_ob (orig_ob); 1626 remove_ob (orig_ob);
1723 free_object2 (orig_ob, 1); 1627 free_object2 (orig_ob, 1);
… …
1731 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1635 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1636 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733 return NULL; 1637 return NULL;
1734 } 1638 }
1735 } 1639 }
1640
1736 newob->nrof = nr; 1641 newob->nrof = nr;
1737 1642
1738 return newob; 1643 return newob;
1739} 1644}
1740 1645
… …
1747 */ 1652 */
1748 1653
1749object * 1654object *
1750decrease_ob_nr (object *op, uint32 i) 1655decrease_ob_nr (object *op, uint32 i)
1751{ 1656{
1752 object * 1657 object *tmp;
1753 tmp;
1754 player * 1658 player *pl;
1755 pl;
1756 1659
1757 if (i == 0) /* objects with op->nrof require this check */ 1660 if (i == 0) /* objects with op->nrof require this check */
1758 return op; 1661 return op;
1759 1662
1760 if (i > op->nrof) 1663 if (i > op->nrof)
1761 i = op->nrof; 1664 i = op->nrof;
1762 1665
1763 if (QUERY_FLAG (op, FLAG_REMOVED)) 1666 if (QUERY_FLAG (op, FLAG_REMOVED))
1764 {
1765 op->nrof -= i; 1667 op->nrof -= i;
1766 }
1767 else if (op->env != NULL) 1668 else if (op->env != NULL)
1768 { 1669 {
1769 /* is this object in the players inventory, or sub container 1670 /* is this object in the players inventory, or sub container
1770 * therein? 1671 * therein?
1771 */ 1672 */
… …
1806 } 1707 }
1807 } 1708 }
1808 } 1709 }
1809 else 1710 else
1810 { 1711 {
1811 object *
1812 above = op->above; 1712 object *above = op->above;
1813 1713
1814 if (i < op->nrof) 1714 if (i < op->nrof)
1815 {
1816 op->nrof -= i; 1715 op->nrof -= i;
1817 }
1818 else 1716 else
1819 { 1717 {
1820 remove_ob (op); 1718 remove_ob (op);
1821 op->nrof = 0; 1719 op->nrof = 0;
1822 } 1720 }
1721
1823 /* Since we just removed op, op->above is null */ 1722 /* Since we just removed op, op->above is null */
1824 for (tmp = above; tmp != NULL; tmp = tmp->above) 1723 for (tmp = above; tmp != NULL; tmp = tmp->above)
1825 if (tmp->type == PLAYER) 1724 if (tmp->type == PLAYER)
1826 { 1725 {
1827 if (op->nrof) 1726 if (op->nrof)
… …
1830 esrv_del_item (tmp->contr, op->count); 1729 esrv_del_item (tmp->contr, op->count);
1831 } 1730 }
1832 } 1731 }
1833 1732
1834 if (op->nrof) 1733 if (op->nrof)
1835 {
1836 return op; 1734 return op;
1837 }
1838 else 1735 else
1839 { 1736 {
1840 free_object (op); 1737 free_object (op);
1841 return NULL; 1738 return NULL;
1842 } 1739 }
… …
1851add_weight (object *op, signed long weight) 1748add_weight (object *op, signed long weight)
1852{ 1749{
1853 while (op != NULL) 1750 while (op != NULL)
1854 { 1751 {
1855 if (op->type == CONTAINER) 1752 if (op->type == CONTAINER)
1856 {
1857 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1753 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858 } 1754
1859 op->carrying += weight; 1755 op->carrying += weight;
1860 op = op->env; 1756 op = op->env;
1861 } 1757 }
1862} 1758}
1863 1759
… …
1886 { 1782 {
1887 dump_object (op); 1783 dump_object (op);
1888 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1784 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889 return op; 1785 return op;
1890 } 1786 }
1787
1891 if (where == NULL) 1788 if (where == NULL)
1892 { 1789 {
1893 dump_object (op); 1790 dump_object (op);
1894 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1791 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895 return op; 1792 return op;
1896 } 1793 }
1794
1897 if (where->head) 1795 if (where->head)
1898 { 1796 {
1899 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1797 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900 where = where->head; 1798 where = where->head;
1901 } 1799 }
1800
1902 if (op->more) 1801 if (op->more)
1903 { 1802 {
1904 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1803 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905 return op; 1804 return op;
1906 } 1805 }
1806
1907 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1807 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908 CLEAR_FLAG (op, FLAG_REMOVED); 1808 CLEAR_FLAG (op, FLAG_REMOVED);
1909 if (op->nrof) 1809 if (op->nrof)
1910 { 1810 {
1911 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1811 for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
… …
2004 tag; 1904 tag;
2005 mapstruct * 1905 mapstruct *
2006 m = op->map; 1906 m = op->map;
2007 int 1907 int
2008 x = op->x, y = op->y; 1908 x = op->x, y = op->y;
1909
2009 MoveType 1910 MoveType
2010 move_on, 1911 move_on,
2011 move_slow, 1912 move_slow,
2012 move_block; 1913 move_block;
2013 1914
… …
2047 * we don't need to check all of them. 1948 * we don't need to check all of them.
2048 */ 1949 */
2049 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) 1950 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050 break; 1951 break;
2051 } 1952 }
1953
2052 for (; tmp != NULL; tmp = tmp->below) 1954 for (; tmp; tmp = tmp->below)
2053 { 1955 {
2054 if (tmp == op) 1956 if (tmp == op)
2055 continue; /* Can't apply yourself */ 1957 continue; /* Can't apply yourself */
2056 1958
2057 /* Check to see if one of the movement types should be slowed down. 1959 /* Check to see if one of the movement types should be slowed down.
… …
2065 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1967 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2066 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1968 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067 { 1969 {
2068 1970
2069 float 1971 float
2070 diff;
2071
2072 diff = tmp->move_slow_penalty * FABS (op->speed); 1972 diff = tmp->move_slow_penalty * FABS (op->speed);
1973
2073 if (op->type == PLAYER) 1974 if (op->type == PLAYER)
2074 {
2075 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1975 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2076 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1976 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077 {
2078 diff /= 4.0; 1977 diff /= 4.0;
2079 } 1978
2080 }
2081 op->speed_left -= diff; 1979 op->speed_left -= diff;
2082 } 1980 }
2083 } 1981 }
2084 1982
2085 /* Basically same logic as above, except now for actual apply. */ 1983 /* Basically same logic as above, except now for actual apply. */
2086 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1984 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2087 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1985 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088 { 1986 {
2089
2090 move_apply (tmp, op, originator); 1987 move_apply (tmp, op, originator);
1988
2091 if (was_destroyed (op, tag)) 1989 if (was_destroyed (op, tag))
2092 return 1; 1990 return 1;
2093 1991
2094 /* what the person/creature stepped onto has moved the object 1992 /* what the person/creature stepped onto has moved the object
2095 * someplace new. Don't process any further - if we did, 1993 * someplace new. Don't process any further - if we did,
… …
2097 */ 1995 */
2098 if (op->map != m || op->x != x || op->y != y) 1996 if (op->map != m || op->x != x || op->y != y)
2099 return 0; 1997 return 0;
2100 } 1998 }
2101 } 1999 }
2000
2102 return 0; 2001 return 0;
2103} 2002}
2104 2003
2105/* 2004/*
2106 * present_arch(arch, map, x, y) searches for any objects with 2005 * present_arch(arch, map, x, y) searches for any objects with
… …
2397find_dir (mapstruct *m, int x, int y, object *exclude) 2296find_dir (mapstruct *m, int x, int y, object *exclude)
2398{ 2297{
2399 int 2298 int
2400 i, 2299 i,
2401 max = SIZEOFFREE, mflags; 2300 max = SIZEOFFREE, mflags;
2402 sint16 2301
2403 nx, 2302 sint16 nx, ny;
2404 ny;
2405 object * 2303 object *
2406 tmp; 2304 tmp;
2407 mapstruct * 2305 mapstruct *
2408 mp; 2306 mp;
2409 MoveType 2307
2410 blocked, 2308 MoveType blocked, move_type;
2411 move_type;
2412 2309
2413 if (exclude && exclude->head) 2310 if (exclude && exclude->head)
2414 { 2311 {
2415 exclude = exclude->head; 2312 exclude = exclude->head;
2416 move_type = exclude->move_type; 2313 move_type = exclude->move_type;
… …
2623 2520
2624 2521
2625int 2522int
2626can_see_monsterP (mapstruct *m, int x, int y, int dir) 2523can_see_monsterP (mapstruct *m, int x, int y, int dir)
2627{ 2524{
2628 sint16 2525 sint16 dx, dy;
2629 dx,
2630 dy;
2631 int 2526 int
2632 mflags; 2527 mflags;
2633 2528
2634 if (dir < 0) 2529 if (dir < 0)
2635 return 0; /* exit condition: invalid direction */ 2530 return 0; /* exit condition: invalid direction */
… …
2766 fprintf (tempfile, obstr); 2661 fprintf (tempfile, obstr);
2767 fclose (tempfile); 2662 fclose (tempfile);
2768 2663
2769 op = get_object (); 2664 op = get_object ();
2770 2665
2771 object_thawer 2666 object_thawer thawer (filename);
2772 thawer (filename);
2773 2667
2774 if (thawer) 2668 if (thawer)
2775 load_object (thawer, op, 0); 2669 load_object (thawer, op, 0);
2776 2670
2777 LOG (llevDebug, " load str completed, object=%s\n", &op->name); 2671 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
… …
2828 * The returned string is shared. 2722 * The returned string is shared.
2829 */ 2723 */
2830const char * 2724const char *
2831get_ob_key_value (const object *op, const char *const key) 2725get_ob_key_value (const object *op, const char *const key)
2832{ 2726{
2833 key_value * 2727 key_value *link;
2834 link; 2728 shstr_cmp canonical_key (key);
2835 const char *
2836 canonical_key;
2837 2729
2838 canonical_key = shstr::find (key);
2839
2840 if (canonical_key == NULL) 2730 if (!canonical_key)
2841 { 2731 {
2842 /* 1. There being a field named key on any object 2732 /* 1. There being a field named key on any object
2843 * implies there'd be a shared string to find. 2733 * implies there'd be a shared string to find.
2844 * 2. Since there isn't, no object has this field. 2734 * 2. Since there isn't, no object has this field.
2845 * 3. Therefore, *this* object doesn't have this field. 2735 * 3. Therefore, *this* object doesn't have this field.
2846 */ 2736 */
2847 return NULL; 2737 return 0;
2848 } 2738 }
2849 2739
2850 /* This is copied from get_ob_key_link() above - 2740 /* This is copied from get_ob_key_link() above -
2851 * only 4 lines, and saves the function call overhead. 2741 * only 4 lines, and saves the function call overhead.
2852 */ 2742 */
2853 for (link = op->key_values; link != NULL; link = link->next) 2743 for (link = op->key_values; link; link = link->next)
2854 {
2855 if (link->key == canonical_key) 2744 if (link->key == canonical_key)
2856 {
2857 return link->value; 2745 return link->value;
2858 } 2746
2859 }
2860 return NULL; 2747 return 0;
2861} 2748}
2862 2749
2863 2750
2864/* 2751/*
2865 * Updates the canonical_key in op to value. 2752 * Updates the canonical_key in op to value.
… …
2901 if (last) 2788 if (last)
2902 last->next = field->next; 2789 last->next = field->next;
2903 else 2790 else
2904 op->key_values = field->next; 2791 op->key_values = field->next;
2905 2792
2906 delete
2907 field; 2793 delete field;
2908 } 2794 }
2909 } 2795 }
2910 return TRUE; 2796 return TRUE;
2911 } 2797 }
2912 /* IF we get here, key doesn't exist */ 2798 /* IF we get here, key doesn't exist */
… …
2947 * Returns TRUE on success. 2833 * Returns TRUE on success.
2948 */ 2834 */
2949int 2835int
2950set_ob_key_value (object *op, const char *key, const char *value, int add_key) 2836set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2951{ 2837{
2952 shstr
2953 key_ (key); 2838 shstr key_ (key);
2954 2839
2955 return set_ob_key_value_s (op, key_, value, add_key); 2840 return set_ob_key_value_s (op, key_, value, add_key);
2956} 2841}
2842
2843object::depth_iterator::depth_iterator (object *container)
2844: iterator_base (container)
2845{
2846 while (item->inv)
2847 item = item->inv;
2848}
2849
2850void
2851object::depth_iterator::next ()
2852{
2853 if (item->below)
2854 {
2855 item = item->below;
2856
2857 while (item->inv)
2858 item = item->inv;
2859 }
2860 else
2861 item = item->env;
2862}
2863
2864// return a suitable string describing an objetc in enough detail to find it
2865const char *
2866object::debug_desc (char *info) const
2867{
2868 char info2[256 * 3];
2869 char *p = info;
2870
2871 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2872 count,
2873 &name,
2874 title ? " " : "",
2875 title ? (const char *)title : "");
2876
2877 if (env)
2878 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2879
2880 if (map)
2881 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2882
2883 return info;
2884}
2885
2886const char *
2887object::debug_desc () const
2888{
2889 static char info[256 * 3];
2890 return debug_desc (info);
2891}
2892

Diff Legend

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