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.74 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC

… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 222
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 225
226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227 || ob1->arch != ob2->arch 227 || ob1->arch != ob2->arch
228 || ob1->name != ob2->name 228 || ob1->name != ob2->name
229 || ob1->title != ob2->title 229 || ob1->title != ob2->title
230 || ob1->msg != ob2->msg 230 || ob1->msg != ob2->msg
231 || ob1->weight != ob2->weight 231 || ob1->weight != ob2->weight
… …
364{ 364{
365 if (!op) 365 if (!op)
366 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
367 367
368 object_freezer freezer; 368 object_freezer freezer;
369 save_object (freezer, op, 3); 369 save_object (freezer, op, 1);
370 return freezer.as_string (); 370 return freezer.as_string ();
371} 371}
372 372
373/* 373/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
… …
467 } 467 }
468 468
469 op->key_values = 0; 469 op->key_values = 0;
470} 470}
471 471
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512}
513
514/* 472/*
515 * copy_to first frees everything allocated by the dst object, 473 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 474 * and then copies the contents of itself into the second
517 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
518 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
… …
524{ 482{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527 485
528 *(object_copy *)dst = *this; 486 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533 487
534 if (is_freed) 488 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
536 490
537 if (is_removed) 491 if (is_removed)
… …
607 extern int arch_init; 561 extern int arch_init;
608 562
609 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
610 * since they never really need to be updated. 564 * since they never really need to be updated.
611 */ 565 */
612
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed) 566 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 { 567 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0; 569 op->speed = 0;
620#endif
621 } 570 }
622 571
623 if (arch_init) 572 if (arch_init)
624 return; 573 return;
625 574
… …
694 op->active_next = NULL; 643 op->active_next = NULL;
695 op->active_prev = NULL; 644 op->active_prev = NULL;
696} 645}
697 646
698/* 647/*
699 * update_object() updates the array which represents the map. 648 * update_object() updates the the map.
700 * It takes into account invisible objects (and represent squares covered 649 * It takes into account invisible objects (and represent squares covered
701 * by invisible objects by whatever is below them (unless it's another 650 * by invisible objects by whatever is below them (unless it's another
702 * invisible object, etc...) 651 * invisible object, etc...)
703 * If the object being updated is beneath a player, the look-window 652 * If the object being updated is beneath a player, the look-window
704 * of that player is updated (this might be a suboptimal way of 653 * of that player is updated (this might be a suboptimal way of
705 * updating that window, though, since update_object() is called _often_) 654 * updating that window, though, since update_object() is called _often_)
706 * 655 *
707 * action is a hint of what the caller believes need to be done. 656 * action is a hint of what the caller believes need to be done.
708 * For example, if the only thing that has changed is the face (due to
709 * an animation), we don't need to call update_position until that actually
710 * comes into view of a player. OTOH, many other things, like addition/removal
711 * of walls or living creatures may need us to update the flags now.
712 * current action are: 657 * current action are:
713 * UP_OBJ_INSERT: op was inserted 658 * UP_OBJ_INSERT: op was inserted
714 * UP_OBJ_REMOVE: op was removed 659 * UP_OBJ_REMOVE: op was removed
715 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 660 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
716 * as that is easier than trying to look at what may have changed. 661 * as that is easier than trying to look at what may have changed.
717 * UP_OBJ_FACE: only the objects face has changed. 662 * UP_OBJ_FACE: only the objects face has changed.
718 */ 663 */
719
720void 664void
721update_object (object *op, int action) 665update_object (object *op, int action)
722{ 666{
723 int update_now = 0, flags;
724 MoveType move_on, move_off, move_block, move_slow; 667 MoveType move_on, move_off, move_block, move_slow;
725 668
726 if (op == NULL) 669 if (op == NULL)
727 { 670 {
728 /* this should never happen */ 671 /* this should never happen */
729 LOG (llevDebug, "update_object() called for NULL object.\n"); 672 LOG (llevDebug, "update_object() called for NULL object.\n");
730 return; 673 return;
731 } 674 }
732 675
733 if (op->env != NULL) 676 if (op->env)
734 { 677 {
735 /* Animation is currently handled by client, so nothing 678 /* Animation is currently handled by client, so nothing
736 * to do in this case. 679 * to do in this case.
737 */ 680 */
738 return; 681 return;
… …
743 */ 686 */
744 if (!op->map || op->map->in_memory == MAP_SAVING) 687 if (!op->map || op->map->in_memory == MAP_SAVING)
745 return; 688 return;
746 689
747 /* make sure the object is within map boundaries */ 690 /* make sure the object is within map boundaries */
748 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 691 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
749 { 692 {
750 LOG (llevError, "update_object() called for object out of map!\n"); 693 LOG (llevError, "update_object() called for object out of map!\n");
751#ifdef MANY_CORES 694#ifdef MANY_CORES
752 abort (); 695 abort ();
753#endif 696#endif
754 return; 697 return;
755 } 698 }
756 699
757 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 700 mapspace &m = op->ms ();
758 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
759 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
760 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
761 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
762 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
763 701
702 if (m.flags_ & P_NEED_UPDATE)
703 /* nop */;
764 if (action == UP_OBJ_INSERT) 704 else if (action == UP_OBJ_INSERT)
765 { 705 {
706 // this is likely overkill, TODO: revisit (schmorp)
766 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 707 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767 update_now = 1;
768
769 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 708 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770 update_now = 1; 709 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
771 710 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
711 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
772 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 712 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
773 update_now = 1;
774
775 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
776 update_now = 1;
777
778 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
779 update_now = 1;
780
781 if ((move_on | op->move_on) != move_on) 713 || (m.move_on | op->move_on ) != m.move_on
782 update_now = 1;
783
784 if ((move_off | op->move_off) != move_off) 714 || (m.move_off | op->move_off ) != m.move_off
785 update_now = 1; 715 || (m.move_slow | op->move_slow) != m.move_slow
786
787 /* This isn't perfect, but I don't expect a lot of objects to 716 /* This isn't perfect, but I don't expect a lot of objects to
788 * to have move_allow right now. 717 * to have move_allow right now.
789 */ 718 */
790 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 719 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
791 update_now = 1; 720 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
792 721 m.flags_ = P_NEED_UPDATE;
793 if ((move_slow | op->move_slow) != move_slow)
794 update_now = 1;
795 } 722 }
796
797 /* if the object is being removed, we can't make intelligent 723 /* if the object is being removed, we can't make intelligent
798 * decisions, because remove_ob can't really pass the object 724 * decisions, because remove_ob can't really pass the object
799 * that is being removed. 725 * that is being removed.
800 */ 726 */
801 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 727 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
802 update_now = 1; 728 m.flags_ = P_NEED_UPDATE;
803 else if (action == UP_OBJ_FACE) 729 else if (action == UP_OBJ_FACE)
804 /* Nothing to do for that case */ ; 730 /* Nothing to do for that case */ ;
805 else 731 else
806 LOG (llevError, "update_object called with invalid action: %d\n", action); 732 LOG (llevError, "update_object called with invalid action: %d\n", action);
807 733
808 if (update_now)
809 {
810 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
811 update_position (op->map, op->x, op->y);
812 }
813
814 if (op->more != NULL) 734 if (op->more)
815 update_object (op->more, action); 735 update_object (op->more, action);
816} 736}
817 737
818object::vector object::mortals;
819object::vector object::objects; // not yet used 738object::vector object::objects; // not yet used
820object *object::first; 739object *object::first;
821
822void object::free_mortals ()
823{
824 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
825 if ((*i)->refcnt)
826 ++i; // further delay freeing
827 else
828 {
829 delete *i;
830 mortals.erase (i);
831 }
832}
833 740
834object::object () 741object::object ()
835{ 742{
836 SET_FLAG (this, FLAG_REMOVED); 743 SET_FLAG (this, FLAG_REMOVED);
837 744
… …
886 * this function to succeed. 793 * this function to succeed.
887 * 794 *
888 * If destroy_inventory is set, free inventory as well. Else drop items in 795 * If destroy_inventory is set, free inventory as well. Else drop items in
889 * inventory to the ground. 796 * inventory to the ground.
890 */ 797 */
891void object::destroy (bool destroy_inventory) 798void
799object::do_destroy ()
892{ 800{
893 if (QUERY_FLAG (this, FLAG_FREED)) 801 attachable::do_destroy ();
802
803 if (flag [FLAG_IS_LINKED])
804 remove_button_link (this);
805
806 if (flag [FLAG_FRIENDLY])
807 remove_friendly_object (this);
808
809 if (!flag [FLAG_REMOVED])
810 remove ();
811
812 if (flag [FLAG_FREED])
894 return; 813 return;
895 814
896 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 815 flag [FLAG_FREED] = 1;
897 remove_friendly_object (this);
898
899 if (!QUERY_FLAG (this, FLAG_REMOVED))
900 remove ();
901
902 SET_FLAG (this, FLAG_FREED);
903
904 if (more)
905 {
906 more->destroy (destroy_inventory);
907 more = 0;
908 }
909
910 if (inv)
911 {
912 /* Only if the space blocks everything do we not process -
913 * if some form of movement is allowed, let objects
914 * drop on that space.
915 */
916 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
917 {
918 object *op = inv;
919
920 while (op)
921 {
922 object *tmp = op->below;
923 op->destroy (destroy_inventory);
924 op = tmp;
925 }
926 }
927 else
928 { /* Put objects in inventory onto this space */
929 object *op = inv;
930
931 while (op)
932 {
933 object *tmp = op->below;
934
935 op->remove ();
936
937 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
938 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
939 op->destroy ();
940 else
941 {
942 op->x = x;
943 op->y = y;
944 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
945 }
946
947 op = tmp;
948 }
949 }
950 }
951 816
952 // hack to ensure that freed objects still have a valid map 817 // hack to ensure that freed objects still have a valid map
953 { 818 {
954 static maptile *freed_map; // freed objects are moved here to avoid crashes 819 static maptile *freed_map; // freed objects are moved here to avoid crashes
955 820
… …
967 map = freed_map; 832 map = freed_map;
968 x = 1; 833 x = 1;
969 y = 1; 834 y = 1;
970 } 835 }
971 836
837 more = 0;
838 head = 0;
839 inv = 0;
840
972 // clear those pointers that likely might have circular references to us 841 // clear those pointers that likely might have circular references to us
973 owner = 0; 842 owner = 0;
974 enemy = 0; 843 enemy = 0;
975 attacked_by = 0; 844 attacked_by = 0;
976 845
… …
980 /* Remove object from the active list */ 849 /* Remove object from the active list */
981 speed = 0; 850 speed = 0;
982 update_ob_speed (this); 851 update_ob_speed (this);
983 852
984 unlink (); 853 unlink ();
854}
985 855
986 mortals.push_back (this); 856/*
857 * Remove and free all objects in the inventory of the given object.
858 * object.c ?
859 */
860void
861object::destroy_inv (bool drop_to_ground)
862{
863 if (!inv)
864 return;
865
866 /* Only if the space blocks everything do we not process -
867 * if some form of movement is allowed, let objects
868 * drop on that space.
869 */
870 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
871 {
872 while (inv)
873 {
874 inv->destroy_inv (drop_to_ground);
875 inv->destroy ();
876 }
877 }
878 else
879 { /* Put objects in inventory onto this space */
880 while (inv)
881 {
882 object *op = inv;
883
884 if (op->flag [FLAG_STARTEQUIP]
885 || op->flag [FLAG_NO_DROP]
886 || op->type == RUNE
887 || op->type == TRAP
888 || op->flag [FLAG_IS_A_TEMPLATE])
889 op->destroy ();
890 else
891 {
892 op->remove ();
893 op->x = x;
894 op->y = y;
895 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
896 }
897 }
898 }
899}
900
901void
902object::destroy (bool destroy_inventory)
903{
904 if (destroyed ())
905 return;
906
907 if (more)
908 {
909 //TODO: non-head objects must not have inventory
910 more->destroy (destroy_inventory);
911 more = 0;
912 }
913
914 if (destroy_inventory)
915 destroy_inv (true);
916
917 attachable::destroy ();
987} 918}
988 919
989/* 920/*
990 * sub_weight() recursively (outwards) subtracts a number from the 921 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 922 * weight of an object (and what is carried by it's environment(s)).
… …
1015object::remove () 946object::remove ()
1016{ 947{
1017 object *tmp, *last = 0; 948 object *tmp, *last = 0;
1018 object *otmp; 949 object *otmp;
1019 950
1020 int check_walk_off;
1021
1022 if (QUERY_FLAG (this, FLAG_REMOVED)) 951 if (QUERY_FLAG (this, FLAG_REMOVED))
1023 return; 952 return;
1024 953
1025 SET_FLAG (this, FLAG_REMOVED); 954 SET_FLAG (this, FLAG_REMOVED);
955 INVOKE_OBJECT (REMOVE, this);
1026 956
1027 if (more) 957 if (more)
1028 more->remove (); 958 more->remove ();
1029 959
1030 /* 960 /*
… …
1041 /* NO_FIX_PLAYER is set when a great many changes are being 971 /* NO_FIX_PLAYER is set when a great many changes are being
1042 * made to players inventory. If set, avoiding the call 972 * made to players inventory. If set, avoiding the call
1043 * to save cpu time. 973 * to save cpu time.
1044 */ 974 */
1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 975 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046 fix_player (otmp); 976 otmp->update_stats ();
1047 977
1048 if (above != NULL) 978 if (above != NULL)
1049 above->below = below; 979 above->below = below;
1050 else 980 else
1051 env->inv = below; 981 env->inv = below;
… …
1070 1000
1071 /* link the object above us */ 1001 /* link the object above us */
1072 if (above) 1002 if (above)
1073 above->below = below; 1003 above->below = below;
1074 else 1004 else
1075 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 1005 map->at (x, y).top = below; /* we were top, set new top */
1076 1006
1077 /* Relink the object below us, if there is one */ 1007 /* Relink the object below us, if there is one */
1078 if (below) 1008 if (below)
1079 below->above = above; 1009 below->above = above;
1080 else 1010 else
… …
1092 dump = dump_object (GET_MAP_OB (map, x, y)); 1022 dump = dump_object (GET_MAP_OB (map, x, y));
1093 LOG (llevError, "%s\n", dump); 1023 LOG (llevError, "%s\n", dump);
1094 free (dump); 1024 free (dump);
1095 } 1025 }
1096 1026
1097 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 1027 map->at (x, y).bot = above; /* goes on above it. */
1098 } 1028 }
1099 1029
1100 above = 0; 1030 above = 0;
1101 below = 0; 1031 below = 0;
1102 1032
1103 if (map->in_memory == MAP_SAVING) 1033 if (map->in_memory == MAP_SAVING)
1104 return; 1034 return;
1105 1035
1106 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1036 int check_walk_off = !flag [FLAG_NO_APPLY];
1107 1037
1108 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1038 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1109 { 1039 {
1110 /* No point updating the players look faces if he is the object 1040 /* No point updating the players look faces if he is the object
1111 * being removed. 1041 * being removed.
… …
1117 * removed (most likely destroyed), update the player view 1047 * removed (most likely destroyed), update the player view
1118 * appropriately. 1048 * appropriately.
1119 */ 1049 */
1120 if (tmp->container == this) 1050 if (tmp->container == this)
1121 { 1051 {
1122 CLEAR_FLAG (this, FLAG_APPLIED); 1052 flag [FLAG_APPLIED] = 0;
1123 tmp->container = 0; 1053 tmp->container = 0;
1124 } 1054 }
1125 1055
1056 if (tmp->contr->ns)
1126 tmp->contr->socket->floorbox_update (); 1057 tmp->contr->ns->floorbox_update ();
1127 } 1058 }
1128 1059
1129 /* See if player moving off should effect something */ 1060 /* See if player moving off should effect something */
1130 if (check_walk_off 1061 if (check_walk_off
1131 && ((move_type & tmp->move_off) 1062 && ((move_type & tmp->move_off)
… …
1145 last = tmp; 1076 last = tmp;
1146 } 1077 }
1147 1078
1148 /* last == NULL of there are no objects on this space */ 1079 /* last == NULL of there are no objects on this space */
1149 if (!last) 1080 if (!last)
1150 { 1081 map->at (x, y).flags_ = P_NEED_UPDATE;
1151 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1152 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1153 * those out anyways, and if there are any flags set right now, they won't
1154 * be correct anyways.
1155 */
1156 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1157 update_position (map, x, y);
1158 }
1159 else 1082 else
1160 update_object (last, UP_OBJ_REMOVE); 1083 update_object (last, UP_OBJ_REMOVE);
1161 1084
1162 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1085 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163 update_all_los (map, x, y); 1086 update_all_los (map, x, y);
1164 } 1087 }
1165} 1088}
1166 1089
1167/* 1090/*
… …
1176merge_ob (object *op, object *top) 1099merge_ob (object *op, object *top)
1177{ 1100{
1178 if (!op->nrof) 1101 if (!op->nrof)
1179 return 0; 1102 return 0;
1180 1103
1181 if (top == NULL) 1104 if (top)
1182 for (top = op; top != NULL && top->above != NULL; top = top->above); 1105 for (top = op; top && top->above; top = top->above)
1106 ;
1183 1107
1184 for (; top != NULL; top = top->below) 1108 for (; top; top = top->below)
1185 { 1109 {
1186 if (top == op) 1110 if (top == op)
1187 continue; 1111 continue;
1188 1112
1189 if (object::can_merge (op, top)) 1113 if (object::can_merge (op, top))
… …
1239 * Return value: 1163 * Return value:
1240 * new object if 'op' was merged with other object 1164 * new object if 'op' was merged with other object
1241 * NULL if 'op' was destroyed 1165 * NULL if 'op' was destroyed
1242 * just 'op' otherwise 1166 * just 'op' otherwise
1243 */ 1167 */
1244
1245object * 1168object *
1246insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1169insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1247{ 1170{
1248 object *tmp, *top, *floor = NULL; 1171 object *tmp, *top, *floor = NULL;
1249 sint16 x, y; 1172 sint16 x, y;
… …
1283 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump); 1206 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284 free (dump); 1207 free (dump);
1285 return op; 1208 return op;
1286 } 1209 }
1287 1210
1288 if (op->more != NULL) 1211 if (op->more)
1289 { 1212 {
1290 /* The part may be on a different map. */ 1213 /* The part may be on a different map. */
1291 1214
1292 object *more = op->more; 1215 object *more = op->more;
1293 1216
… …
1309 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1232 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1310 { 1233 {
1311 if (!op->head) 1234 if (!op->head)
1312 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1235 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1313 1236
1314 return NULL; 1237 return 0;
1315 } 1238 }
1316 } 1239 }
1317 1240
1318 CLEAR_FLAG (op, FLAG_REMOVED); 1241 CLEAR_FLAG (op, FLAG_REMOVED);
1319 1242
… …
1353 op->below = originator->below; 1276 op->below = originator->below;
1354 1277
1355 if (op->below) 1278 if (op->below)
1356 op->below->above = op; 1279 op->below->above = op;
1357 else 1280 else
1358 SET_MAP_OB (op->map, op->x, op->y, op); 1281 op->ms ().bot = op;
1359 1282
1360 /* since *below* originator, no need to update top */ 1283 /* since *below* originator, no need to update top */
1361 originator->below = op; 1284 originator->below = op;
1362 } 1285 }
1363 else 1286 else
… …
1409 * If INS_ON_TOP is used, don't do this processing 1332 * If INS_ON_TOP is used, don't do this processing
1410 * Need to find the object that in fact blocks view, otherwise 1333 * Need to find the object that in fact blocks view, otherwise
1411 * stacking is a bit odd. 1334 * stacking is a bit odd.
1412 */ 1335 */
1413 if (!(flag & INS_ON_TOP) && 1336 if (!(flag & INS_ON_TOP) &&
1414 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1337 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1415 { 1338 {
1416 for (last = top; last != floor; last = last->below) 1339 for (last = top; last != floor; last = last->below)
1417 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1340 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418 break; 1341 break;
1419 /* Check to see if we found the object that blocks view, 1342 /* Check to see if we found the object that blocks view,
… …
1442 1365
1443 if (op->above) 1366 if (op->above)
1444 op->above->below = op; 1367 op->above->below = op;
1445 1368
1446 op->below = NULL; 1369 op->below = NULL;
1447 SET_MAP_OB (op->map, op->x, op->y, op); 1370 op->ms ().bot = op;
1448 } 1371 }
1449 else 1372 else
1450 { /* get inserted into the stack above top */ 1373 { /* get inserted into the stack above top */
1451 op->above = top->above; 1374 op->above = top->above;
1452 1375
… …
1456 op->below = top; 1379 op->below = top;
1457 top->above = op; 1380 top->above = op;
1458 } 1381 }
1459 1382
1460 if (op->above == NULL) 1383 if (op->above == NULL)
1461 SET_MAP_TOP (op->map, op->x, op->y, op); 1384 op->ms ().top = op;
1462 } /* else not INS_BELOW_ORIGINATOR */ 1385 } /* else not INS_BELOW_ORIGINATOR */
1463 1386
1464 if (op->type == PLAYER) 1387 if (op->type == PLAYER)
1465 op->contr->do_los = 1; 1388 op->contr->do_los = 1;
1466 1389
1467 /* If we have a floor, we know the player, if any, will be above 1390 /* If we have a floor, we know the player, if any, will be above
1468 * it, so save a few ticks and start from there. 1391 * it, so save a few ticks and start from there.
1469 */ 1392 */
1470 if (!(flag & INS_MAP_LOAD)) 1393 if (!(flag & INS_MAP_LOAD))
1471 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1394 if (object *pl = op->ms ().player ())
1472 if (tmp->type == PLAYER) 1395 if (pl->contr->ns)
1473 tmp->contr->socket->floorbox_update (); 1396 pl->contr->ns->floorbox_update ();
1474 1397
1475 /* If this object glows, it may affect lighting conditions that are 1398 /* If this object glows, it may affect lighting conditions that are
1476 * visible to others on this map. But update_all_los is really 1399 * visible to others on this map. But update_all_los is really
1477 * an inefficient way to do this, as it means los for all players 1400 * an inefficient way to do this, as it means los for all players
1478 * on the map will get recalculated. The players could very well 1401 * on the map will get recalculated. The players could very well
1479 * be far away from this change and not affected in any way - 1402 * be far away from this change and not affected in any way -
1480 * this should get redone to only look for players within range, 1403 * this should get redone to only look for players within range,
1481 * or just updating the P_NEED_UPDATE for spaces within this area 1404 * or just updating the P_NEED_UPDATE for spaces within this area
1482 * of effect may be sufficient. 1405 * of effect may be sufficient.
1483 */ 1406 */
1484 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1407 if (op->map->darkness && (op->glow_radius != 0))
1485 update_all_los (op->map, op->x, op->y); 1408 update_all_los (op->map, op->x, op->y);
1486 1409
1487 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1410 /* updates flags (blocked, alive, no magic, etc) for this map space */
1488 update_object (op, UP_OBJ_INSERT); 1411 update_object (op, UP_OBJ_INSERT);
1412
1413 INVOKE_OBJECT (INSERT, op);
1489 1414
1490 /* Don't know if moving this to the end will break anything. However, 1415 /* Don't know if moving this to the end will break anything. However,
1491 * we want to have floorbox_update called before calling this. 1416 * we want to have floorbox_update called before calling this.
1492 * 1417 *
1493 * check_move_on() must be after this because code called from 1418 * check_move_on() must be after this because code called from
… …
1498 1423
1499 /* if this is not the head or flag has been passed, don't check walk on status */ 1424 /* if this is not the head or flag has been passed, don't check walk on status */
1500 if (!(flag & INS_NO_WALK_ON) && !op->head) 1425 if (!(flag & INS_NO_WALK_ON) && !op->head)
1501 { 1426 {
1502 if (check_move_on (op, originator)) 1427 if (check_move_on (op, originator))
1503 return NULL; 1428 return 0;
1504 1429
1505 /* If we are a multi part object, lets work our way through the check 1430 /* If we are a multi part object, lets work our way through the check
1506 * walk on's. 1431 * walk on's.
1507 */ 1432 */
1508 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1433 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1509 if (check_move_on (tmp, originator)) 1434 if (check_move_on (tmp, originator))
1510 return NULL; 1435 return 0;
1511 } 1436 }
1512 1437
1513 return op; 1438 return op;
1514} 1439}
1515 1440
1516/* this function inserts an object in the map, but if it 1441/* this function inserts an object in the map, but if it
1517 * finds an object of its own type, it'll remove that one first. 1442 * finds an object of its own type, it'll remove that one first.
1518 * op is the object to insert it under: supplies x and the map. 1443 * op is the object to insert it under: supplies x and the map.
1519 */ 1444 */
1520void 1445void
1521replace_insert_ob_in_map (const char *arch_string, object *op) 1446replace_insert_ob_in_map (const char *arch_string, object *op)
1522{ 1447{
1523 object * 1448 object *tmp, *tmp1;
1524 tmp;
1525 object *
1526 tmp1;
1527 1449
1528 /* first search for itself and remove any old instances */ 1450 /* first search for itself and remove any old instances */
1529 1451
1530 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1452 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1531 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1453 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
… …
1589 1511
1590object * 1512object *
1591decrease_ob_nr (object *op, uint32 i) 1513decrease_ob_nr (object *op, uint32 i)
1592{ 1514{
1593 object *tmp; 1515 object *tmp;
1594 player *pl;
1595 1516
1596 if (i == 0) /* objects with op->nrof require this check */ 1517 if (i == 0) /* objects with op->nrof require this check */
1597 return op; 1518 return op;
1598 1519
1599 if (i > op->nrof) 1520 if (i > op->nrof)
… …
1612 * IMO, searching through all the players will mostly 1533 * IMO, searching through all the players will mostly
1613 * likely be quicker than following op->env to the map, 1534 * likely be quicker than following op->env to the map,
1614 * and then searching the map for a player. 1535 * and then searching the map for a player.
1615 */ 1536 */
1616 if (!tmp) 1537 if (!tmp)
1617 { 1538 for_all_players (pl)
1618 for (pl = first_player; pl; pl = pl->next)
1619 if (pl->ob->container == op->env) 1539 if (pl->ob->container == op->env)
1620 { 1540 {
1621 tmp = pl->ob; 1541 tmp = pl->ob;
1622 break; 1542 break;
1623 } 1543 }
1624 }
1625 1544
1626 if (i < op->nrof) 1545 if (i < op->nrof)
1627 { 1546 {
1628 sub_weight (op->env, op->weight * i); 1547 sub_weight (op->env, op->weight * i);
1629 op->nrof -= i; 1548 op->nrof -= i;
… …
1765 add_weight (this, (op->weight + op->carrying)); 1684 add_weight (this, (op->weight + op->carrying));
1766 1685
1767 otmp = this->in_player (); 1686 otmp = this->in_player ();
1768 if (otmp && otmp->contr) 1687 if (otmp && otmp->contr)
1769 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1688 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1770 fix_player (otmp); 1689 otmp->update_stats ();
1771 1690
1772 op->map = 0; 1691 op->map = 0;
1773 op->env = this; 1692 op->env = this;
1774 op->above = 0; 1693 op->above = 0;
1775 op->below = 0; 1694 op->below = 0;
… …
1779 if ((op->glow_radius != 0) && map) 1698 if ((op->glow_radius != 0) && map)
1780 { 1699 {
1781#ifdef DEBUG_LIGHTS 1700#ifdef DEBUG_LIGHTS
1782 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1701 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1783#endif /* DEBUG_LIGHTS */ 1702#endif /* DEBUG_LIGHTS */
1784 if (MAP_DARKNESS (map)) 1703 if (map->darkness)
1785 update_all_los (map, x, y); 1704 update_all_los (map, x, y);
1786 } 1705 }
1787 1706
1788 /* Client has no idea of ordering so lets not bother ordering it here. 1707 /* Client has no idea of ordering so lets not bother ordering it here.
1789 * It sure simplifies this function... 1708 * It sure simplifies this function...
… …
1794 { 1713 {
1795 op->below = inv; 1714 op->below = inv;
1796 op->below->above = op; 1715 op->below->above = op;
1797 inv = op; 1716 inv = op;
1798 } 1717 }
1718
1719 INVOKE_OBJECT (INSERT, this);
1799 1720
1800 return op; 1721 return op;
1801} 1722}
1802 1723
1803/* 1724/*
… …
1855 1776
1856 /* The objects have to be checked from top to bottom. 1777 /* The objects have to be checked from top to bottom.
1857 * Hence, we first go to the top: 1778 * Hence, we first go to the top:
1858 */ 1779 */
1859 1780
1860 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1861 { 1782 {
1862 /* Trim the search when we find the first other spell effect 1783 /* Trim the search when we find the first other spell effect
1863 * this helps performance so that if a space has 50 spell objects, 1784 * this helps performance so that if a space has 50 spell objects,
1864 * we don't need to check all of them. 1785 * we don't need to check all of them.
1865 */ 1786 */
… …
1920/* 1841/*
1921 * present_arch(arch, map, x, y) searches for any objects with 1842 * present_arch(arch, map, x, y) searches for any objects with
1922 * a matching archetype at the given map and coordinates. 1843 * a matching archetype at the given map and coordinates.
1923 * The first matching object is returned, or NULL if none. 1844 * The first matching object is returned, or NULL if none.
1924 */ 1845 */
1925
1926object * 1846object *
1927present_arch (const archetype *at, maptile *m, int x, int y) 1847present_arch (const archetype *at, maptile *m, int x, int y)
1928{ 1848{
1929 object *
1930 tmp;
1931
1932 if (m == NULL || out_of_map (m, x, y)) 1849 if (m == NULL || out_of_map (m, x, y))
1933 { 1850 {
1934 LOG (llevError, "Present_arch called outside map.\n"); 1851 LOG (llevError, "Present_arch called outside map.\n");
1935 return NULL; 1852 return NULL;
1936 } 1853 }
1854
1937 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1938 if (tmp->arch == at) 1856 if (tmp->arch == at)
1939 return tmp; 1857 return tmp;
1858
1940 return NULL; 1859 return NULL;
1941} 1860}
1942 1861
1943/* 1862/*
1944 * present(type, map, x, y) searches for any objects with 1863 * present(type, map, x, y) searches for any objects with
1945 * a matching type variable at the given map and coordinates. 1864 * a matching type variable at the given map and coordinates.
1946 * The first matching object is returned, or NULL if none. 1865 * The first matching object is returned, or NULL if none.
1947 */ 1866 */
1948
1949object * 1867object *
1950present (unsigned char type, maptile *m, int x, int y) 1868present (unsigned char type, maptile *m, int x, int y)
1951{ 1869{
1952 object *
1953 tmp;
1954
1955 if (out_of_map (m, x, y)) 1870 if (out_of_map (m, x, y))
1956 { 1871 {
1957 LOG (llevError, "Present called outside map.\n"); 1872 LOG (llevError, "Present called outside map.\n");
1958 return NULL; 1873 return NULL;
1959 } 1874 }
1875
1960 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1961 if (tmp->type == type) 1877 if (tmp->type == type)
1962 return tmp; 1878 return tmp;
1879
1963 return NULL; 1880 return NULL;
1964} 1881}
1965 1882
1966/* 1883/*
1967 * present_in_ob(type, object) searches for any objects with 1884 * present_in_ob(type, object) searches for any objects with
1968 * a matching type variable in the inventory of the given object. 1885 * a matching type variable in the inventory of the given object.
1969 * The first matching object is returned, or NULL if none. 1886 * The first matching object is returned, or NULL if none.
1970 */ 1887 */
1971
1972object * 1888object *
1973present_in_ob (unsigned char type, const object *op) 1889present_in_ob (unsigned char type, const object *op)
1974{ 1890{
1975 object *
1976 tmp;
1977
1978 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1891 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1979 if (tmp->type == type) 1892 if (tmp->type == type)
1980 return tmp; 1893 return tmp;
1894
1981 return NULL; 1895 return NULL;
1982} 1896}
1983 1897
1984/* 1898/*
1985 * present_in_ob (type, str, object) searches for any objects with 1899 * present_in_ob (type, str, object) searches for any objects with
… …
1993 * str is the string to match against. Note that we match against 1907 * str is the string to match against. Note that we match against
1994 * the object name, not the archetype name. this is so that the 1908 * the object name, not the archetype name. this is so that the
1995 * spell code can use one object type (force), but change it's name 1909 * spell code can use one object type (force), but change it's name
1996 * to be unique. 1910 * to be unique.
1997 */ 1911 */
1998
1999object * 1912object *
2000present_in_ob_by_name (int type, const char *str, const object *op) 1913present_in_ob_by_name (int type, const char *str, const object *op)
2001{ 1914{
2002 object *
2003 tmp;
2004
2005 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1915 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006 {
2007 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1916 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2008 return tmp; 1917 return tmp;
2009 } 1918
2010 return NULL; 1919 return 0;
2011} 1920}
2012 1921
2013/* 1922/*
2014 * present_arch_in_ob(archetype, object) searches for any objects with 1923 * present_arch_in_ob(archetype, object) searches for any objects with
2015 * a matching archetype in the inventory of the given object. 1924 * a matching archetype in the inventory of the given object.
2016 * The first matching object is returned, or NULL if none. 1925 * The first matching object is returned, or NULL if none.
2017 */ 1926 */
2018
2019object * 1927object *
2020present_arch_in_ob (const archetype *at, const object *op) 1928present_arch_in_ob (const archetype *at, const object *op)
2021{ 1929{
2022 object *
2023 tmp;
2024
2025 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1930 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2026 if (tmp->arch == at) 1931 if (tmp->arch == at)
2027 return tmp; 1932 return tmp;
1933
2028 return NULL; 1934 return NULL;
2029} 1935}
2030 1936
2031/* 1937/*
2032 * activate recursively a flag on an object inventory 1938 * activate recursively a flag on an object inventory
2033 */ 1939 */
2034void 1940void
2035flag_inv (object *op, int flag) 1941flag_inv (object *op, int flag)
2036{ 1942{
2037 object *
2038 tmp;
2039
2040 if (op->inv) 1943 if (op->inv)
2041 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2042 { 1945 {
2043 SET_FLAG (tmp, flag); 1946 SET_FLAG (tmp, flag);
2044 flag_inv (tmp, flag); 1947 flag_inv (tmp, flag);
2045 } 1948 }
2046} /* 1949}
1950
1951/*
2047 * desactivate recursively a flag on an object inventory 1952 * deactivate recursively a flag on an object inventory
2048 */ 1953 */
2049void 1954void
2050unflag_inv (object *op, int flag) 1955unflag_inv (object *op, int flag)
2051{ 1956{
2052 object *
2053 tmp;
2054
2055 if (op->inv) 1957 if (op->inv)
2056 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057 { 1959 {
2058 CLEAR_FLAG (tmp, flag); 1960 CLEAR_FLAG (tmp, flag);
2059 unflag_inv (tmp, flag); 1961 unflag_inv (tmp, flag);
2060 } 1962 }
2061} 1963}
… …
2064 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2065 * all it's inventory (recursively). 1967 * all it's inventory (recursively).
2066 * If checksums are used, a player will get set_cheat called for 1968 * If checksums are used, a player will get set_cheat called for
2067 * him/her-self and all object carried by a call to this function. 1969 * him/her-self and all object carried by a call to this function.
2068 */ 1970 */
2069
2070void 1971void
2071set_cheat (object *op) 1972set_cheat (object *op)
2072{ 1973{
2073 SET_FLAG (op, FLAG_WAS_WIZ); 1974 SET_FLAG (op, FLAG_WAS_WIZ);
2074 flag_inv (op, FLAG_WAS_WIZ); 1975 flag_inv (op, FLAG_WAS_WIZ);
… …
2093 * because arch_blocked (now ob_blocked) needs to know the movement type 1994 * because arch_blocked (now ob_blocked) needs to know the movement type
2094 * to know if the space in question will block the object. We can't use 1995 * to know if the space in question will block the object. We can't use
2095 * the archetype because that isn't correct if the monster has been 1996 * the archetype because that isn't correct if the monster has been
2096 * customized, changed states, etc. 1997 * customized, changed states, etc.
2097 */ 1998 */
2098
2099int 1999int
2100find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2101{ 2001{
2102 int
2103 i,
2104 index = 0, flag; 2002 int index = 0, flag;
2105 static int
2106 altern[SIZEOFFREE]; 2003 int altern[SIZEOFFREE];
2107 2004
2108 for (i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
2109 { 2006 {
2110 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2111 if (!flag) 2008 if (!flag)
2112 altern[index++] = i; 2009 altern [index++] = i;
2113 2010
2114 /* Basically, if we find a wall on a space, we cut down the search size. 2011 /* Basically, if we find a wall on a space, we cut down the search size.
2115 * In this way, we won't return spaces that are on another side of a wall. 2012 * In this way, we won't return spaces that are on another side of a wall.
2116 * This mostly work, but it cuts down the search size in all directions - 2013 * This mostly work, but it cuts down the search size in all directions -
2117 * if the space being examined only has a wall to the north and empty 2014 * if the space being examined only has a wall to the north and empty
… …
2133 * find_first_free_spot(archetype, maptile, x, y) works like 2030 * find_first_free_spot(archetype, maptile, x, y) works like
2134 * find_free_spot(), but it will search max number of squares. 2031 * find_free_spot(), but it will search max number of squares.
2135 * But it will return the first available spot, not a random choice. 2032 * But it will return the first available spot, not a random choice.
2136 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2033 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2137 */ 2034 */
2138
2139int 2035int
2140find_first_free_spot (const object *ob, maptile *m, int x, int y) 2036find_first_free_spot (const object *ob, maptile *m, int x, int y)
2141{ 2037{
2142 int
2143 i;
2144
2145 for (i = 0; i < SIZEOFFREE; i++) 2038 for (int i = 0; i < SIZEOFFREE; i++)
2146 {
2147 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2148 return i; 2040 return i;
2149 } 2041
2150 return -1; 2042 return -1;
2151} 2043}
2152 2044
2153/* 2045/*
2154 * The function permute(arr, begin, end) randomly reorders the array 2046 * The function permute(arr, begin, end) randomly reorders the array
2155 * arr[begin..end-1]. 2047 * arr[begin..end-1].
2048 * now uses a fisher-yates shuffle, old permute was broken
2156 */ 2049 */
2157static void 2050static void
2158permute (int *arr, int begin, int end) 2051permute (int *arr, int begin, int end)
2159{ 2052{
2160 int 2053 arr += begin;
2161 i,
2162 j,
2163 tmp,
2164 len;
2165
2166 len = end - begin; 2054 end -= begin;
2167 for (i = begin; i < end; i++)
2168 {
2169 j = begin + RANDOM () % len;
2170 2055
2171 tmp = arr[i]; 2056 while (--end)
2172 arr[i] = arr[j]; 2057 swap (arr [end], arr [RANDOM () % (end + 1)]);
2173 arr[j] = tmp;
2174 }
2175} 2058}
2176 2059
2177/* new function to make monster searching more efficient, and effective! 2060/* new function to make monster searching more efficient, and effective!
2178 * This basically returns a randomized array (in the passed pointer) of 2061 * This basically returns a randomized array (in the passed pointer) of
2179 * the spaces to find monsters. In this way, it won't always look for 2062 * the spaces to find monsters. In this way, it won't always look for
… …
2182 * the 3x3 area will be searched, just not in a predictable order. 2065 * the 3x3 area will be searched, just not in a predictable order.
2183 */ 2066 */
2184void 2067void
2185get_search_arr (int *search_arr) 2068get_search_arr (int *search_arr)
2186{ 2069{
2187 int 2070 int i;
2188 i;
2189 2071
2190 for (i = 0; i < SIZEOFFREE; i++) 2072 for (i = 0; i < SIZEOFFREE; i++)
2191 {
2192 search_arr[i] = i; 2073 search_arr[i] = i;
2193 }
2194 2074
2195 permute (search_arr, 1, SIZEOFFREE1 + 1); 2075 permute (search_arr, 1, SIZEOFFREE1 + 1);
2196 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2076 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2197 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2077 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2198} 2078}
… …
2207 * Perhaps incorrectly, but I'm making the assumption that exclude 2087 * Perhaps incorrectly, but I'm making the assumption that exclude
2208 * is actually want is going to try and move there. We need this info 2088 * is actually want is going to try and move there. We need this info
2209 * because we have to know what movement the thing looking to move 2089 * because we have to know what movement the thing looking to move
2210 * there is capable of. 2090 * there is capable of.
2211 */ 2091 */
2212
2213int 2092int
2214find_dir (maptile *m, int x, int y, object *exclude) 2093find_dir (maptile *m, int x, int y, object *exclude)
2215{ 2094{
2216 int
2217 i,
2218 max = SIZEOFFREE, mflags; 2095 int i, max = SIZEOFFREE, mflags;
2219 2096
2220 sint16 nx, ny; 2097 sint16 nx, ny;
2221 object * 2098 object *tmp;
2222 tmp;
2223 maptile * 2099 maptile *mp;
2224 mp;
2225 2100
2226 MoveType blocked, move_type; 2101 MoveType blocked, move_type;
2227 2102
2228 if (exclude && exclude->head) 2103 if (exclude && exclude->head)
2229 { 2104 {
… …
2241 mp = m; 2116 mp = m;
2242 nx = x + freearr_x[i]; 2117 nx = x + freearr_x[i];
2243 ny = y + freearr_y[i]; 2118 ny = y + freearr_y[i];
2244 2119
2245 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2120 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2121
2246 if (mflags & P_OUT_OF_MAP) 2122 if (mflags & P_OUT_OF_MAP)
2247 {
2248 max = maxfree[i]; 2123 max = maxfree[i];
2249 }
2250 else 2124 else
2251 { 2125 {
2252 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2126 mapspace &ms = mp->at (nx, ny);
2127
2128 blocked = ms.move_block;
2253 2129
2254 if ((move_type & blocked) == move_type) 2130 if ((move_type & blocked) == move_type)
2255 {
2256 max = maxfree[i]; 2131 max = maxfree[i];
2257 }
2258 else if (mflags & P_IS_ALIVE) 2132 else if (mflags & P_IS_ALIVE)
2259 { 2133 {
2260 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2134 for (tmp = ms.bot; tmp; tmp = tmp->above)
2261 { 2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2262 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2136 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2263 {
2264 break; 2137 break;
2265 } 2138
2266 }
2267 if (tmp) 2139 if (tmp)
2268 {
2269 return freedir[i]; 2140 return freedir[i];
2270 }
2271 } 2141 }
2272 } 2142 }
2273 } 2143 }
2144
2274 return 0; 2145 return 0;
2275} 2146}
2276 2147
2277/* 2148/*
2278 * distance(object 1, object 2) will return the square of the 2149 * distance(object 1, object 2) will return the square of the
2279 * distance between the two given objects. 2150 * distance between the two given objects.
2280 */ 2151 */
2281
2282int 2152int
2283distance (const object *ob1, const object *ob2) 2153distance (const object *ob1, const object *ob2)
2284{ 2154{
2285 int
2286 i;
2287
2288 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2155 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2289 return i;
2290} 2156}
2291 2157
2292/* 2158/*
2293 * find_dir_2(delta-x,delta-y) will return a direction in which 2159 * find_dir_2(delta-x,delta-y) will return a direction in which
2294 * an object which has subtracted the x and y coordinates of another 2160 * an object which has subtracted the x and y coordinates of another
2295 * object, needs to travel toward it. 2161 * object, needs to travel toward it.
2296 */ 2162 */
2297
2298int 2163int
2299find_dir_2 (int x, int y) 2164find_dir_2 (int x, int y)
2300{ 2165{
2301 int 2166 int q;
2302 q;
2303 2167
2304 if (y) 2168 if (y)
2305 q = x * 100 / y; 2169 q = x * 100 / y;
2306 else if (x) 2170 else if (x)
2307 q = -300 * x; 2171 q = -300 * x;
… …
2342int 2206int
2343absdir (int d) 2207absdir (int d)
2344{ 2208{
2345 while (d < 1) 2209 while (d < 1)
2346 d += 8; 2210 d += 8;
2211
2347 while (d > 8) 2212 while (d > 8)
2348 d -= 8; 2213 d -= 8;
2214
2349 return d; 2215 return d;
2350} 2216}
2351 2217
2352/* 2218/*
2353 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2355 */ 2221 */
2356 2222
2357int 2223int
2358dirdiff (int dir1, int dir2) 2224dirdiff (int dir1, int dir2)
2359{ 2225{
2360 int 2226 int d;
2361 d;
2362 2227
2363 d = abs (dir1 - dir2); 2228 d = abs (dir1 - dir2);
2364 if (d > 4) 2229 if (d > 4)
2365 d = 8 - d; 2230 d = 8 - d;
2231
2366 return d; 2232 return d;
2367} 2233}
2368 2234
2369/* peterm: 2235/* peterm:
2370 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2236 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2373 * This basically means that if direction is 15, then it could either go 2239 * This basically means that if direction is 15, then it could either go
2374 * direction 4, 14, or 16 to get back to where we are. 2240 * direction 4, 14, or 16 to get back to where we are.
2375 * Moved from spell_util.c to object.c with the other related direction 2241 * Moved from spell_util.c to object.c with the other related direction
2376 * functions. 2242 * functions.
2377 */ 2243 */
2378
2379int
2380 reduction_dir[SIZEOFFREE][3] = { 2244int reduction_dir[SIZEOFFREE][3] = {
2381 {0, 0, 0}, /* 0 */ 2245 {0, 0, 0}, /* 0 */
2382 {0, 0, 0}, /* 1 */ 2246 {0, 0, 0}, /* 1 */
2383 {0, 0, 0}, /* 2 */ 2247 {0, 0, 0}, /* 2 */
2384 {0, 0, 0}, /* 3 */ 2248 {0, 0, 0}, /* 3 */
2385 {0, 0, 0}, /* 4 */ 2249 {0, 0, 0}, /* 4 */
… …
2433 * find a path to that monster that we found. If not, 2297 * find a path to that monster that we found. If not,
2434 * we don't bother going toward it. Returns 1 if we 2298 * we don't bother going toward it. Returns 1 if we
2435 * can see a direct way to get it 2299 * can see a direct way to get it
2436 * Modified to be map tile aware -.MSW 2300 * Modified to be map tile aware -.MSW
2437 */ 2301 */
2438
2439
2440int 2302int
2441can_see_monsterP (maptile *m, int x, int y, int dir) 2303can_see_monsterP (maptile *m, int x, int y, int dir)
2442{ 2304{
2443 sint16 dx, dy; 2305 sint16 dx, dy;
2444 int
2445 mflags; 2306 int mflags;
2446 2307
2447 if (dir < 0) 2308 if (dir < 0)
2448 return 0; /* exit condition: invalid direction */ 2309 return 0; /* exit condition: invalid direction */
2449 2310
2450 dx = x + freearr_x[dir]; 2311 dx = x + freearr_x[dir];
… …
2463 return 0; 2324 return 0;
2464 2325
2465 /* yes, can see. */ 2326 /* yes, can see. */
2466 if (dir < 9) 2327 if (dir < 9)
2467 return 1; 2328 return 1;
2329
2468 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2330 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2469 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2331 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2332 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2470} 2333}
2471
2472
2473 2334
2474/* 2335/*
2475 * can_pick(picker, item): finds out if an object is possible to be 2336 * can_pick(picker, item): finds out if an object is possible to be
2476 * picked up by the picker. Returnes 1 if it can be 2337 * picked up by the picker. Returnes 1 if it can be
2477 * picked up, otherwise 0. 2338 * picked up, otherwise 0.
… …
2488 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2489 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2490 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2351 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2491} 2352}
2492 2353
2493
2494/* 2354/*
2495 * create clone from object to another 2355 * create clone from object to another
2496 */ 2356 */
2497object * 2357object *
2498object_create_clone (object *asrc) 2358object_create_clone (object *asrc)
… …
2517 { 2377 {
2518 dst = tmp; 2378 dst = tmp;
2519 tmp->head = 0; 2379 tmp->head = 0;
2520 } 2380 }
2521 else 2381 else
2522 {
2523 tmp->head = dst; 2382 tmp->head = dst;
2524 }
2525 2383
2526 tmp->more = 0; 2384 tmp->more = 0;
2527 2385
2528 if (prev) 2386 if (prev)
2529 prev->more = tmp; 2387 prev->more = tmp;
… …
2541/* Basically, we save the content of the string to a temp file, then call */ 2399/* Basically, we save the content of the string to a temp file, then call */
2542/* load_object on it. I admit it is a highly inefficient way to make things, */ 2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2543/* but it was simple to make and allows reusing the load_object function. */ 2401/* but it was simple to make and allows reusing the load_object function. */
2544/* Remember not to use load_object_str in a time-critical situation. */ 2402/* Remember not to use load_object_str in a time-critical situation. */
2545/* Also remember that multiparts objects are not supported for now. */ 2403/* Also remember that multiparts objects are not supported for now. */
2546
2547object * 2404object *
2548load_object_str (const char *obstr) 2405load_object_str (const char *obstr)
2549{ 2406{
2550 object *op; 2407 object *op;
2551 char filename[MAX_BUF]; 2408 char filename[MAX_BUF];
… …
2581 * returns NULL if no match. 2438 * returns NULL if no match.
2582 */ 2439 */
2583object * 2440object *
2584find_obj_by_type_subtype (const object *who, int type, int subtype) 2441find_obj_by_type_subtype (const object *who, int type, int subtype)
2585{ 2442{
2586 object *tmp;
2587
2588 for (tmp = who->inv; tmp; tmp = tmp->below) 2443 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2589 if (tmp->type == type && tmp->subtype == subtype) 2444 if (tmp->type == type && tmp->subtype == subtype)
2590 return tmp; 2445 return tmp;
2591 2446
2592 return NULL; 2447 return 0;
2593} 2448}
2594 2449
2595/* If ob has a field named key, return the link from the list, 2450/* If ob has a field named key, return the link from the list,
2596 * otherwise return NULL. 2451 * otherwise return NULL.
2597 * 2452 *
… …
2599 * do the desired thing. 2454 * do the desired thing.
2600 */ 2455 */
2601key_value * 2456key_value *
2602get_ob_key_link (const object *ob, const char *key) 2457get_ob_key_link (const object *ob, const char *key)
2603{ 2458{
2604 key_value *link;
2605
2606 for (link = ob->key_values; link != NULL; link = link->next) 2459 for (key_value *link = ob->key_values; link; link = link->next)
2607 if (link->key == key) 2460 if (link->key == key)
2608 return link; 2461 return link;
2609 2462
2610 return NULL; 2463 return 0;
2611} 2464}
2612 2465
2613/* 2466/*
2614 * Returns the value of op has an extra_field for key, or NULL. 2467 * Returns the value of op has an extra_field for key, or NULL.
2615 * 2468 *
… …
2655 * Returns TRUE on success. 2508 * Returns TRUE on success.
2656 */ 2509 */
2657int 2510int
2658set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2511set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2659{ 2512{
2660 key_value *
2661 field = NULL, *last = NULL; 2513 key_value *field = NULL, *last = NULL;
2662 2514
2663 for (field = op->key_values; field != NULL; field = field->next) 2515 for (field = op->key_values; field != NULL; field = field->next)
2664 { 2516 {
2665 if (field->key != canonical_key) 2517 if (field->key != canonical_key)
2666 { 2518 {
… …
2694 /* IF we get here, key doesn't exist */ 2546 /* IF we get here, key doesn't exist */
2695 2547
2696 /* No field, we'll have to add it. */ 2548 /* No field, we'll have to add it. */
2697 2549
2698 if (!add_key) 2550 if (!add_key)
2699 {
2700 return FALSE; 2551 return FALSE;
2701 } 2552
2702 /* There isn't any good reason to store a null 2553 /* There isn't any good reason to store a null
2703 * value in the key/value list. If the archetype has 2554 * value in the key/value list. If the archetype has
2704 * this key, then we should also have it, so shouldn't 2555 * this key, then we should also have it, so shouldn't
2705 * be here. If user wants to store empty strings, 2556 * be here. If user wants to store empty strings,
2706 * should pass in "" 2557 * should pass in ""

Diff Legend

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