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

Diff Legend

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