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.36 by root, Tue Sep 12 19:20:06 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;
37 37
38object *objects; /* Pointer to the list of used objects */ 38object *objects; /* Pointer to the list of used objects */
… …
207 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)
208 return 0; 208 return 0;
209 209
210 switch (ob1->type) 210 switch (ob1->type)
211 { 211 {
212 case SCROLL: 212 case SCROLL:
213 if (ob1->level != ob2->level) 213 if (ob1->level != ob2->level)
214 return 0; 214 return 0;
215 break; 215 break;
216 } 216 }
217 217
218 if (ob1->key_values != NULL || ob2->key_values != NULL) 218 if (ob1->key_values != NULL || ob2->key_values != NULL)
219 { 219 {
220 /* At least one of these has key_values. */ 220 /* At least one of these has key_values. */
… …
416 */ 416 */
417 417
418object * 418object *
419find_object_name (const char *str) 419find_object_name (const char *str)
420{ 420{
421 const char *name = shstr::find (str); 421 shstr_cmp str_ (str);
422 object *op; 422 object *op;
423 423
424 for (op = objects; op != NULL; op = op->next) 424 for (op = objects; op != NULL; op = op->next)
425 if (&op->name == name) 425 if (op->name == str_)
426 break; 426 break;
427 427
428 return op; 428 return op;
429} 429}
430 430
… …
442 * Changed 2004-02-12 - if the player is setting at the play again 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 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 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. 445 * anything - once an object is removed, it is basically dead anyways.
446 */ 446 */
447
448object * 447object *
449get_owner (object *op) 448object::get_owner ()
450{ 449{
451 if (op->owner == NULL) 450 if (!owner
452 return NULL; 451 || QUERY_FLAG (owner, FLAG_FREED)
452 || QUERY_FLAG (owner, FLAG_REMOVED))
453 owner = 0;
453 454
454 if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455 return op->owner; 455 return owner;
456
457 op->owner = NULL;
458 op->ownercount = 0;
459 return NULL;
460}
461
462void
463clear_owner (object *op)
464{
465 if (!op)
466 return;
467
468 if (op->owner && op->ownercount == op->owner->count)
469 op->owner->refcount--;
470
471 op->owner = NULL;
472 op->ownercount = 0;
473} 456}
474 457
475/* 458/*
476 * Sets the owner and sets the skill and exp pointers to owner's current 459 * Sets the owner and sets the skill and exp pointers to owner's current
477 * skill and experience objects. 460 * skill and experience objects.
478 */ 461 */
479void 462void
480set_owner (object *op, object *owner) 463object::set_owner (object *owner)
481{ 464{
482 if (owner == NULL || op == NULL) 465 if (!owner)
483 return; 466 return;
484 467
485 /* next line added to allow objects which own objects */ 468 /* next line added to allow objects which own objects */
486 /* Add a check for ownercounts in here, as I got into an endless loop 469 /* 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 470 * with the fireball owning a poison cloud which then owned the
488 * fireball. I believe that was caused by one of the objects getting 471 * fireball. I believe that was caused by one of the objects getting
489 * freed and then another object replacing it. Since the ownercounts 472 * 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. 473 * didn't match, this check is valid and I believe that cause is valid.
491 */ 474 */
492 while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count) 475 while (owner->owner)
493 owner = owner->owner; 476 owner = owner->owner;
494 477
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; 478 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} 479}
535 480
536/* Zero the key_values on op, decrementing the shared-string 481/* Zero the key_values on op, decrementing the shared-string
537 * refcounts and freeing the links. 482 * refcounts and freeing the links.
538 */ 483 */
… …
554{ 499{
555 attachable_base::clear (); 500 attachable_base::clear ();
556 501
557 free_key_values (this); 502 free_key_values (this);
558 503
559 clear_owner (this); 504 owner = 0;
560
561 name = 0; 505 name = 0;
562 name_pl = 0; 506 name_pl = 0;
563 title = 0; 507 title = 0;
564 race = 0; 508 race = 0;
565 slaying = 0; 509 slaying = 0;
566 skill = 0; 510 skill = 0;
567 msg = 0; 511 msg = 0;
568 lore = 0; 512 lore = 0;
569 custom_name = 0; 513 custom_name = 0;
570 materialname = 0; 514 materialname = 0;
515 contr = 0;
516 below = 0;
517 above = 0;
518 inv = 0;
519 container = 0;
520 env = 0;
521 more = 0;
522 head = 0;
523 map = 0;
524 active_next = 0;
525 active_prev = 0;
571 526
572 memset (static_cast < object_pod * >(this), 0, sizeof (object_pod)); 527 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573 528
574 SET_FLAG (this, FLAG_REMOVED); 529 SET_FLAG (this, FLAG_REMOVED);
530
531 /* What is not cleared is next, prev, and count */
532
533 expmul = 1.0;
534 face = blank_face;
535 attacked_by_count = -1;
536
537 if (settings.casting_time)
538 casting_time = -1;
575} 539}
576 540
577void object::clone (object *destination) 541void object::clone (object *destination)
578{ 542{
579 *(object_copy *) destination = *this; 543 *(object_copy *)destination = *this;
580 *(object_pod *) destination = *this; 544 *(object_pod *)destination = *this;
581 545
582 if (self || cb) 546 if (self || cb)
583 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 547 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} 548}
617 549
618/* 550/*
619 * copy object first frees everything allocated by the second object, 551 * copy object first frees everything allocated by the second object,
620 * and then copies the contends of the first object into the second 552 * and then copies the contends of the first object into the second
621 * object, allocating what needs to be allocated. Basically, any 553 * object, allocating what needs to be allocated. Basically, any
622 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 554 * 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 555 * if the first object is freed, the pointers in the new object
624 * will point at garbage. 556 * will point at garbage.
625 */ 557 */
626
627void 558void
628copy_object (object *op2, object *op) 559copy_object (object *op2, object *op)
629{ 560{
630 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 561 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
631 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 562 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
… …
691/* 622/*
692 * Updates the speed of an object. If the speed changes from 0 to another 623 * 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. 624 * 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. 625 * This function needs to be called whenever the speed of an object changes.
695 */ 626 */
696
697void 627void
698update_ob_speed (object *op) 628update_ob_speed (object *op)
699{ 629{
700 extern int arch_init; 630 extern int arch_init;
701 631
… …
710 abort (); 640 abort ();
711#else 641#else
712 op->speed = 0; 642 op->speed = 0;
713#endif 643#endif
714 } 644 }
645
715 if (arch_init) 646 if (arch_init)
716 {
717 return; 647 return;
718 } 648
719 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 649 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720 { 650 {
721 /* If already on active list, don't do anything */ 651 /* If already on active list, don't do anything */
722 if (op->active_next || op->active_prev || op == active_objects) 652 if (op->active_next || op->active_prev || op == active_objects)
723 return; 653 return;
724 654
725 /* process_events() expects us to insert the object at the beginning 655 /* process_events() expects us to insert the object at the beginning
726 * of the list. */ 656 * of the list. */
727 op->active_next = active_objects; 657 op->active_next = active_objects;
658
728 if (op->active_next != NULL) 659 if (op->active_next != NULL)
729 op->active_next->active_prev = op; 660 op->active_next->active_prev = op;
661
730 active_objects = op; 662 active_objects = op;
731 } 663 }
732 else 664 else
733 { 665 {
734 /* If not on the active list, nothing needs to be done */ 666 /* If not on the active list, nothing needs to be done */
… …
736 return; 668 return;
737 669
738 if (op->active_prev == NULL) 670 if (op->active_prev == NULL)
739 { 671 {
740 active_objects = op->active_next; 672 active_objects = op->active_next;
673
741 if (op->active_next != NULL) 674 if (op->active_next != NULL)
742 op->active_next->active_prev = NULL; 675 op->active_next->active_prev = NULL;
743 } 676 }
744 else 677 else
745 { 678 {
746 op->active_prev->active_next = op->active_next; 679 op->active_prev->active_next = op->active_next;
680
747 if (op->active_next) 681 if (op->active_next)
748 op->active_next->active_prev = op->active_prev; 682 op->active_next->active_prev = op->active_prev;
749 } 683 }
684
750 op->active_next = NULL; 685 op->active_next = NULL;
751 op->active_prev = NULL; 686 op->active_prev = NULL;
752 } 687 }
753} 688}
754 689
… …
886 * that is being removed. 821 * that is being removed.
887 */ 822 */
888 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 823 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889 update_now = 1; 824 update_now = 1;
890 else if (action == UP_OBJ_FACE) 825 else if (action == UP_OBJ_FACE)
891 /* Nothing to do for that case */; 826 /* Nothing to do for that case */ ;
892 else 827 else
893 LOG (llevError, "update_object called with invalid action: %d\n", action); 828 LOG (llevError, "update_object called with invalid action: %d\n", action);
894 829
895 if (update_now) 830 if (update_now)
896 { 831 {
… …
905static unordered_vector<object *> mortals; 840static unordered_vector<object *> mortals;
906static std::vector<object *> freed; 841static std::vector<object *> freed;
907 842
908void object::free_mortals () 843void object::free_mortals ()
909{ 844{
910 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ) 845 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
911 if (!(*i)->refcount) 846 if ((*i)->refcnt)
847 ++i; // further delay freeing
848 else
912 { 849 {
913 freed.push_back (*i); 850 freed.push_back (*i);//D
851 //delete *i;
914 mortals.erase (i); 852 mortals.erase (i);
915 } 853 }
916 else 854
917 ++i; 855 if (mortals.size() && 0)//D
856 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
918} 857}
919 858
920object::object () 859object::object ()
921{ 860{
922 SET_FLAG (this, FLAG_REMOVED); 861 SET_FLAG (this, FLAG_REMOVED);
… …
972 if (freed.empty ()) 911 if (freed.empty ())
973 op = new object; 912 op = new object;
974 else 913 else
975 { 914 {
976 // highly annoying, but the only way to get it stable right now 915 // highly annoying, but the only way to get it stable right now
977 op = freed.back (); freed.pop_back (); 916 op = freed.back ();
917 freed.pop_back ();
978 op->~object (); 918 op->~object ();
979 new ((void *)op) object; 919 new ((void *) op) object;
980 } 920 }
981 921
982 op->link (); 922 op->link ();
983 return op; 923 return op;
984} 924}
… …
993 * If free_inventory is set, free inventory as well. Else drop items in 933 * If free_inventory is set, free inventory as well. Else drop items in
994 * inventory to the ground. 934 * inventory to the ground.
995 */ 935 */
996void object::free (bool free_inventory) 936void object::free (bool free_inventory)
997{ 937{
938 if (QUERY_FLAG (this, FLAG_FREED))
939 return;
940
941 if (QUERY_FLAG (this, FLAG_FRIENDLY))
942 remove_friendly_object (this);
943
998 if (!QUERY_FLAG (this, FLAG_REMOVED)) 944 if (!QUERY_FLAG (this, FLAG_REMOVED))
999 { 945 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 946
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)) 947 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 948
1020 if (more) 949 if (more)
1021 { 950 {
1022 more->free (free_inventory); 951 more->free (free_inventory);
1023 more = 0; 952 more = 0;
… …
1027 { 956 {
1028 /* Only if the space blocks everything do we not process - 957 /* Only if the space blocks everything do we not process -
1029 * if some form of movement is allowed, let objects 958 * if some form of movement is allowed, let objects
1030 * drop on that space. 959 * drop on that space.
1031 */ 960 */
1032 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)) 961 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033 { 962 {
1034 object * 963 object *op = inv;
1035 op = inv;
1036 964
1037 while (op) 965 while (op)
1038 { 966 {
1039 object *
1040 tmp = op->below; 967 object *tmp = op->below;
1041
1042 remove_ob (op);
1043 op->free (free_inventory); 968 op->free (free_inventory);
1044 op = tmp; 969 op = tmp;
1045 } 970 }
1046 } 971 }
1047 else 972 else
1048 { /* Put objects in inventory onto this space */ 973 { /* Put objects in inventory onto this space */
1049 object * 974 object *op = inv;
1050 op = inv;
1051 975
1052 while (op) 976 while (op)
1053 { 977 {
1054 object *
1055 tmp = op->below; 978 object *tmp = op->below;
1056 979
1057 remove_ob (op); 980 remove_ob (op);
1058 981
1059 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 982 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)) 983 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
… …
1069 op = tmp; 992 op = tmp;
1070 } 993 }
1071 } 994 }
1072 } 995 }
1073 996
1074 clear_owner (this); 997 owner = 0;
1075 998
1076 /* Remove object from the active list */ 999 /* Remove object from the active list */
1077 speed = 0; 1000 speed = 0;
1078 update_ob_speed (this); 1001 update_ob_speed (this);
1079 1002
1080 unlink (); 1003 unlink ();
1081
1082 SET_FLAG (this, FLAG_FREED);
1083 1004
1084 mortals.push_back (this); 1005 mortals.push_back (this);
1085} 1006}
1086 1007
1087/* 1008/*
… …
1113 */ 1034 */
1114 1035
1115void 1036void
1116remove_ob (object *op) 1037remove_ob (object *op)
1117{ 1038{
1118 object *tmp, *last = NULL;
1119 object *otmp; 1039 object *
1040 tmp, *
1041 last = NULL;
1042 object *
1043 otmp;
1120 1044
1121 tag_t tag; 1045 tag_t
1046 tag;
1047 int
1122 int check_walk_off; 1048 check_walk_off;
1123 mapstruct *m; 1049 mapstruct *
1050 m;
1124 1051
1125 sint16 x, y; 1052 sint16
1053 x,
1054 y;
1126 1055
1127 if (QUERY_FLAG (op, FLAG_REMOVED)) 1056 if (QUERY_FLAG (op, FLAG_REMOVED))
1128 { 1057 return;
1129 dump_object (op);
1130 LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131 1058
1132 /* Changed it to always dump core in this case. As has been learned 1059 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 1060
1145 if (op->more != NULL) 1061 if (op->more != NULL)
1146 remove_ob (op->more); 1062 remove_ob (op->more);
1147
1148 SET_FLAG (op, FLAG_REMOVED);
1149 1063
1150 /* 1064 /*
1151 * In this case, the object to be removed is in someones 1065 * In this case, the object to be removed is in someones
1152 * inventory. 1066 * inventory.
1153 */ 1067 */
… …
1179 */ 1093 */
1180 op->x = op->env->x, op->y = op->env->y; 1094 op->x = op->env->x, op->y = op->env->y;
1181 op->map = op->env->map; 1095 op->map = op->env->map;
1182 op->above = NULL, op->below = NULL; 1096 op->above = NULL, op->below = NULL;
1183 op->env = NULL; 1097 op->env = NULL;
1184 return; 1098 }
1099 else if (op->map)
1185 } 1100 {
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; 1101 x = op->x;
1192 y = op->y; 1102 y = op->y;
1193 m = get_map_from_coord (op->map, &x, &y); 1103 m = get_map_from_coord (op->map, &x, &y);
1194 1104
1195 if (!m) 1105 if (!m)
1196 { 1106 {
1197 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1107 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); 1108 op->map->path, op->x, op->y);
1199 /* in old days, we used to set x and y to 0 and continue. 1109 /* 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 1110 * it seems if we get into this case, something is probablye
1201 * screwed up and should be fixed. 1111 * screwed up and should be fixed.
1112 */
1113 abort ();
1114 }
1115
1116 if (op->map != m)
1117 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118 op->map->path, m->path, op->x, op->y, x, y);
1119
1120 /* Re did the following section of code - it looks like it had
1121 * lots of logic for things we no longer care about
1202 */ 1122 */
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 1123
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 */ 1124 /* link the object above us */
1216 if (op->above) 1125 if (op->above)
1217 op->above->below = op->below; 1126 op->above->below = op->below;
1218 else 1127 else
1219 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1128 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1220 1129
1221 /* Relink the object below us, if there is one */ 1130 /* Relink the object below us, if there is one */
1222 if (op->below) 1131 if (op->below)
1223 op->below->above = op->above; 1132 op->below->above = op->above;
1224 else 1133 else
1225 { 1134 {
1226 /* Nothing below, which means we need to relink map object for this space 1135 /* 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 1136 * use translated coordinates in case some oddness with map tiling is
1228 * evident 1137 * 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 */ 1138 */
1263 if (tmp->container == op) 1139 if (GET_MAP_OB (m, x, y) != op)
1264 { 1140 {
1265 CLEAR_FLAG (op, FLAG_APPLIED); 1141 dump_object (op);
1266 tmp->container = NULL; 1142 LOG (llevError,
1143 "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);
1144 dump_object (GET_MAP_OB (m, x, y));
1145 LOG (llevError, "%s\n", errmsg);
1267 } 1146 }
1268 1147
1269 tmp->contr->socket.update_look = 1; 1148 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 { 1149 }
1274 move_apply (tmp, op, NULL);
1275 1150
1276 if (was_destroyed (op, tag)) 1151 op->above = 0;
1152 op->below = 0;
1153
1154 if (op->map->in_memory == MAP_SAVING)
1155 return;
1156
1157 tag = op->count;
1158 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159
1160 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1161 {
1162 /* No point updating the players look faces if he is the object
1163 * being removed.
1164 */
1165
1166 if (tmp->type == PLAYER && tmp != op)
1277 { 1167 {
1278 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1168 /* If a container that the player is currently using somehow gets
1169 * removed (most likely destroyed), update the player view
1170 * appropriately.
1171 */
1172 if (tmp->container == op)
1173 {
1174 CLEAR_FLAG (op, FLAG_APPLIED);
1175 tmp->container = NULL;
1176 }
1177
1178 tmp->contr->socket.update_look = 1;
1279 } 1179 }
1180
1181 /* See if player moving off should effect something */
1182 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183 {
1184 move_apply (tmp, op, NULL);
1185
1186 if (was_destroyed (op, tag))
1187 {
1188 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1189 }
1280 } 1190 }
1281 1191
1282 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1192 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283 1193
1284 if (tmp->above == tmp) 1194 if (tmp->above == tmp)
1285 tmp->above = NULL; 1195 tmp->above = NULL;
1286 1196
1287 last = tmp; 1197 last = tmp;
1288 } 1198 }
1289 1199
1290 /* last == NULL of there are no objects on this space */ 1200 /* last == NULL of there are no objects on this space */
1291 if (last == NULL) 1201 if (last == NULL)
1292 { 1202 {
1293 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1203 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1204 * 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 1205 * those out anyways, and if there are any flags set right now, they won't
1296 * be correct anyways. 1206 * be correct anyways.
1297 */ 1207 */
1298 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1208 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299 update_position (op->map, op->x, op->y); 1209 update_position (op->map, op->x, op->y);
1300 } 1210 }
1301 else 1211 else
1302 update_object (last, UP_OBJ_REMOVE); 1212 update_object (last, UP_OBJ_REMOVE);
1303 1213
1304 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1214 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1305 update_all_los (op->map, op->x, op->y); 1215 update_all_los (op->map, op->x, op->y);
1216 }
1306} 1217}
1307 1218
1308/* 1219/*
1309 * merge_ob(op,top): 1220 * merge_ob(op,top):
1310 * 1221 *
… …
1317object * 1228object *
1318merge_ob (object *op, object *top) 1229merge_ob (object *op, object *top)
1319{ 1230{
1320 if (!op->nrof) 1231 if (!op->nrof)
1321 return 0; 1232 return 0;
1233
1322 if (top == NULL) 1234 if (top == NULL)
1323 for (top = op; top != NULL && top->above != NULL; top = top->above); 1235 for (top = op; top != NULL && top->above != NULL; top = top->above);
1236
1324 for (; top != NULL; top = top->below) 1237 for (; top != NULL; top = top->below)
1325 { 1238 {
1326 if (top == op) 1239 if (top == op)
1327 continue; 1240 continue;
1328 if (CAN_MERGE (op, top)) 1241 if (CAN_MERGE (op, top))
… …
1334 remove_ob (op); 1247 remove_ob (op);
1335 free_object (op); 1248 free_object (op);
1336 return top; 1249 return top;
1337 } 1250 }
1338 } 1251 }
1252
1339 return NULL; 1253 return NULL;
1340} 1254}
1341 1255
1342/* 1256/*
1343 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1257 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1344 * job preparing multi-part monsters 1258 * job preparing multi-part monsters
1345 */ 1259 */
1346object * 1260object *
1347insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1261insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1348{ 1262{
1349 object * 1263 object *tmp;
1350 tmp;
1351 1264
1352 if (op->head) 1265 if (op->head)
1353 op = op->head; 1266 op = op->head;
1267
1354 for (tmp = op; tmp; tmp = tmp->more) 1268 for (tmp = op; tmp; tmp = tmp->more)
1355 { 1269 {
1356 tmp->x = x + tmp->arch->clone.x; 1270 tmp->x = x + tmp->arch->clone.x;
1357 tmp->y = y + tmp->arch->clone.y; 1271 tmp->y = y + tmp->arch->clone.y;
1358 } 1272 }
1273
1359 return insert_ob_in_map (op, m, originator, flag); 1274 return insert_ob_in_map (op, m, originator, flag);
1360} 1275}
1361 1276
1362/* 1277/*
1363 * insert_ob_in_map (op, map, originator, flag): 1278 * insert_ob_in_map (op, map, originator, flag):
… …
1654 * op is the object to insert it under: supplies x and the map. 1569 * op is the object to insert it under: supplies x and the map.
1655 */ 1570 */
1656void 1571void
1657replace_insert_ob_in_map (const char *arch_string, object *op) 1572replace_insert_ob_in_map (const char *arch_string, object *op)
1658{ 1573{
1659 object *tmp; 1574 object *
1575 tmp;
1660 object *tmp1; 1576 object *
1577 tmp1;
1661 1578
1662 /* first search for itself and remove any old instances */ 1579 /* first search for itself and remove any old instances */
1663 1580
1664 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1581 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665 { 1582 {
… …
1696 if (orig_ob->nrof < nr) 1613 if (orig_ob->nrof < nr)
1697 { 1614 {
1698 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1615 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699 return NULL; 1616 return NULL;
1700 } 1617 }
1618
1701 newob = object_create_clone (orig_ob); 1619 newob = object_create_clone (orig_ob);
1620
1702 if ((orig_ob->nrof -= nr) < 1) 1621 if ((orig_ob->nrof -= nr) < 1)
1703 { 1622 {
1704 if (!is_removed) 1623 if (!is_removed)
1705 remove_ob (orig_ob); 1624 remove_ob (orig_ob);
1706 free_object2 (orig_ob, 1); 1625 free_object2 (orig_ob, 1);
… …
1714 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1633 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"); 1634 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716 return NULL; 1635 return NULL;
1717 } 1636 }
1718 } 1637 }
1638
1719 newob->nrof = nr; 1639 newob->nrof = nr;
1720 1640
1721 return newob; 1641 return newob;
1722} 1642}
1723 1643
… …
1730 */ 1650 */
1731 1651
1732object * 1652object *
1733decrease_ob_nr (object *op, uint32 i) 1653decrease_ob_nr (object *op, uint32 i)
1734{ 1654{
1735 object * 1655 object *tmp;
1736 tmp;
1737 player * 1656 player *pl;
1738 pl;
1739 1657
1740 if (i == 0) /* objects with op->nrof require this check */ 1658 if (i == 0) /* objects with op->nrof require this check */
1741 return op; 1659 return op;
1742 1660
1743 if (i > op->nrof) 1661 if (i > op->nrof)
1744 i = op->nrof; 1662 i = op->nrof;
1745 1663
1746 if (QUERY_FLAG (op, FLAG_REMOVED)) 1664 if (QUERY_FLAG (op, FLAG_REMOVED))
1747 {
1748 op->nrof -= i; 1665 op->nrof -= i;
1749 }
1750 else if (op->env != NULL) 1666 else if (op->env != NULL)
1751 { 1667 {
1752 /* is this object in the players inventory, or sub container 1668 /* is this object in the players inventory, or sub container
1753 * therein? 1669 * therein?
1754 */ 1670 */
… …
1789 } 1705 }
1790 } 1706 }
1791 } 1707 }
1792 else 1708 else
1793 { 1709 {
1794 object *
1795 above = op->above; 1710 object *above = op->above;
1796 1711
1797 if (i < op->nrof) 1712 if (i < op->nrof)
1798 {
1799 op->nrof -= i; 1713 op->nrof -= i;
1800 }
1801 else 1714 else
1802 { 1715 {
1803 remove_ob (op); 1716 remove_ob (op);
1804 op->nrof = 0; 1717 op->nrof = 0;
1805 } 1718 }
1719
1806 /* Since we just removed op, op->above is null */ 1720 /* Since we just removed op, op->above is null */
1807 for (tmp = above; tmp != NULL; tmp = tmp->above) 1721 for (tmp = above; tmp != NULL; tmp = tmp->above)
1808 if (tmp->type == PLAYER) 1722 if (tmp->type == PLAYER)
1809 { 1723 {
1810 if (op->nrof) 1724 if (op->nrof)
… …
1813 esrv_del_item (tmp->contr, op->count); 1727 esrv_del_item (tmp->contr, op->count);
1814 } 1728 }
1815 } 1729 }
1816 1730
1817 if (op->nrof) 1731 if (op->nrof)
1818 {
1819 return op; 1732 return op;
1820 }
1821 else 1733 else
1822 { 1734 {
1823 free_object (op); 1735 free_object (op);
1824 return NULL; 1736 return NULL;
1825 } 1737 }
… …
1834add_weight (object *op, signed long weight) 1746add_weight (object *op, signed long weight)
1835{ 1747{
1836 while (op != NULL) 1748 while (op != NULL)
1837 { 1749 {
1838 if (op->type == CONTAINER) 1750 if (op->type == CONTAINER)
1839 {
1840 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1751 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841 } 1752
1842 op->carrying += weight; 1753 op->carrying += weight;
1843 op = op->env; 1754 op = op->env;
1844 } 1755 }
1845} 1756}
1846 1757
… …
1869 { 1780 {
1870 dump_object (op); 1781 dump_object (op);
1871 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg); 1782 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872 return op; 1783 return op;
1873 } 1784 }
1785
1874 if (where == NULL) 1786 if (where == NULL)
1875 { 1787 {
1876 dump_object (op); 1788 dump_object (op);
1877 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg); 1789 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878 return op; 1790 return op;
1879 } 1791 }
1792
1880 if (where->head) 1793 if (where->head)
1881 { 1794 {
1882 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n"); 1795 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883 where = where->head; 1796 where = where->head;
1884 } 1797 }
1798
1885 if (op->more) 1799 if (op->more)
1886 { 1800 {
1887 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1801 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888 return op; 1802 return op;
1889 } 1803 }
1804
1890 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1805 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1806 CLEAR_FLAG (op, FLAG_REMOVED);
1892 if (op->nrof) 1807 if (op->nrof)
1893 { 1808 {
1894 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1809 for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
… …
1979 */ 1894 */
1980 1895
1981int 1896int
1982check_move_on (object *op, object *originator) 1897check_move_on (object *op, object *originator)
1983{ 1898{
1984 object *tmp; 1899 object *
1985 tag_t tag; 1900 tmp;
1986 mapstruct *m = op->map; 1901 tag_t
1902 tag;
1903 mapstruct *
1904 m = op->map;
1905 int
1987 int x = op->x, y = op->y; 1906 x = op->x, y = op->y;
1988 1907
1989 MoveType move_on, move_slow, move_block; 1908 MoveType
1909 move_on,
1910 move_slow,
1911 move_block;
1990 1912
1991 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1913 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992 return 0; 1914 return 0;
1993 1915
1994 tag = op->count; 1916 tag = op->count;
… …
2042 { 1964 {
2043 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1965 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)) 1966 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045 { 1967 {
2046 1968
1969 float
2047 float diff = tmp->move_slow_penalty * FABS (op->speed); 1970 diff = tmp->move_slow_penalty * FABS (op->speed);
2048 1971
2049 if (op->type == PLAYER) 1972 if (op->type == PLAYER)
2050 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1973 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))) 1974 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052 diff /= 4.0; 1975 diff /= 4.0;
… …
2371find_dir (mapstruct *m, int x, int y, object *exclude) 2294find_dir (mapstruct *m, int x, int y, object *exclude)
2372{ 2295{
2373 int 2296 int
2374 i, 2297 i,
2375 max = SIZEOFFREE, mflags; 2298 max = SIZEOFFREE, mflags;
2376 sint16 2299
2377 nx, 2300 sint16 nx, ny;
2378 ny;
2379 object * 2301 object *
2380 tmp; 2302 tmp;
2381 mapstruct * 2303 mapstruct *
2382 mp; 2304 mp;
2383 MoveType 2305
2384 blocked, 2306 MoveType blocked, move_type;
2385 move_type;
2386 2307
2387 if (exclude && exclude->head) 2308 if (exclude && exclude->head)
2388 { 2309 {
2389 exclude = exclude->head; 2310 exclude = exclude->head;
2390 move_type = exclude->move_type; 2311 move_type = exclude->move_type;
… …
2597 2518
2598 2519
2599int 2520int
2600can_see_monsterP (mapstruct *m, int x, int y, int dir) 2521can_see_monsterP (mapstruct *m, int x, int y, int dir)
2601{ 2522{
2602 sint16 2523 sint16 dx, dy;
2603 dx,
2604 dy;
2605 int 2524 int
2606 mflags; 2525 mflags;
2607 2526
2608 if (dir < 0) 2527 if (dir < 0)
2609 return 0; /* exit condition: invalid direction */ 2528 return 0; /* exit condition: invalid direction */
… …
2740 fprintf (tempfile, obstr); 2659 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2660 fclose (tempfile);
2742 2661
2743 op = get_object (); 2662 op = get_object ();
2744 2663
2745 object_thawer 2664 object_thawer thawer (filename);
2746 thawer (filename);
2747 2665
2748 if (thawer) 2666 if (thawer)
2749 load_object (thawer, op, 0); 2667 load_object (thawer, op, 0);
2750 2668
2751 LOG (llevDebug, " load str completed, object=%s\n", &op->name); 2669 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
… …
2802 * The returned string is shared. 2720 * The returned string is shared.
2803 */ 2721 */
2804const char * 2722const char *
2805get_ob_key_value (const object *op, const char *const key) 2723get_ob_key_value (const object *op, const char *const key)
2806{ 2724{
2807 key_value * 2725 key_value *link;
2808 link; 2726 shstr_cmp canonical_key (key);
2809 const char *
2810 canonical_key;
2811 2727
2812 canonical_key = shstr::find (key);
2813
2814 if (canonical_key == NULL) 2728 if (!canonical_key)
2815 { 2729 {
2816 /* 1. There being a field named key on any object 2730 /* 1. There being a field named key on any object
2817 * implies there'd be a shared string to find. 2731 * implies there'd be a shared string to find.
2818 * 2. Since there isn't, no object has this field. 2732 * 2. Since there isn't, no object has this field.
2819 * 3. Therefore, *this* object doesn't have this field. 2733 * 3. Therefore, *this* object doesn't have this field.
2820 */ 2734 */
2821 return NULL; 2735 return 0;
2822 } 2736 }
2823 2737
2824 /* This is copied from get_ob_key_link() above - 2738 /* This is copied from get_ob_key_link() above -
2825 * only 4 lines, and saves the function call overhead. 2739 * only 4 lines, and saves the function call overhead.
2826 */ 2740 */
2827 for (link = op->key_values; link != NULL; link = link->next) 2741 for (link = op->key_values; link; link = link->next)
2828 {
2829 if (link->key == canonical_key) 2742 if (link->key == canonical_key)
2830 {
2831 return link->value; 2743 return link->value;
2832 } 2744
2833 }
2834 return NULL; 2745 return 0;
2835} 2746}
2836 2747
2837 2748
2838/* 2749/*
2839 * Updates the canonical_key in op to value. 2750 * Updates the canonical_key in op to value.
… …
2875 if (last) 2786 if (last)
2876 last->next = field->next; 2787 last->next = field->next;
2877 else 2788 else
2878 op->key_values = field->next; 2789 op->key_values = field->next;
2879 2790
2880 delete
2881 field; 2791 delete field;
2882 } 2792 }
2883 } 2793 }
2884 return TRUE; 2794 return TRUE;
2885 } 2795 }
2886 /* IF we get here, key doesn't exist */ 2796 /* IF we get here, key doesn't exist */
… …
2921 * Returns TRUE on success. 2831 * Returns TRUE on success.
2922 */ 2832 */
2923int 2833int
2924set_ob_key_value (object *op, const char *key, const char *value, int add_key) 2834set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925{ 2835{
2926 shstr
2927 key_ (key); 2836 shstr key_ (key);
2928 2837
2929 return set_ob_key_value_s (op, key_, value, add_key); 2838 return set_ob_key_value_s (op, key_, value, add_key);
2930} 2839}
2840
2841object::depth_iterator::depth_iterator (object *container)
2842: iterator_base (container)
2843{
2844 while (item->inv)
2845 item = item->inv;
2846}
2847
2848void
2849object::depth_iterator::next ()
2850{
2851 if (item->below)
2852 {
2853 item = item->below;
2854
2855 while (item->inv)
2856 item = item->inv;
2857 }
2858 else
2859 item = item->env;
2860}
2861
2862// return a suitable string describing an objetc in enough detail to find it
2863const char *
2864object::debug_desc (char *info) const
2865{
2866 char info2[256 * 3];
2867 char *p = info;
2868
2869 p += snprintf (p, 256, "%d=\"%s%s%s\"",
2870 count,
2871 &name,
2872 title ? " " : "",
2873 title ? (const char *)title : "");
2874
2875 if (env)
2876 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2877
2878 if (map)
2879 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
2880
2881 return info;
2882}
2883
2884const char *
2885object::debug_desc () const
2886{
2887 static char info[256 * 3];
2888 return debug_desc (info);
2889}
2890

Diff Legend

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