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.18 by root, Fri Sep 8 16:51:42 2006 UTC vs.
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.18 2006/09/08 16:51:42 root Exp $"; 3 * "$Id: object.C,v 1.21 2006/09/09 21:48:28 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
54 {0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45, 54 {0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45,
55 48,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49}; 55 48,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49};
56int freedir[SIZEOFFREE]= { 56int freedir[SIZEOFFREE]= {
57 0,1,2,3,4,5,6,7,8,1,2,2,2,3,4,4,4,5,6,6,6,7,8,8,8, 57 0,1,2,3,4,5,6,7,8,1,2,2,2,3,4,4,4,5,6,6,6,7,8,8,8,
58 1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8}; 58 1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8};
59
60 59
61/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 60/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
62static int compare_ob_value_lists_one(const object * wants, const object * has) { 61static int compare_ob_value_lists_one(const object * wants, const object * has) {
63 key_value * wants_field; 62 key_value * wants_field;
64 63
… …
624 623
625 update_ob_speed (op); 624 update_ob_speed (op);
626} 625}
627 626
628/* 627/*
629 * get_object() grabs an object from the list of unused objects, makes
630 * sure it is initialised, and returns it.
631 * If there are no free objects, expand_objects() is called to get more.
632 */
633
634object *get_object ()
635{
636 object *op = new object;
637
638 op->count = ++ob_count;
639
640 op->next = objects;
641
642 if (objects)
643 objects->prev = op;
644
645 objects = op;
646
647 SET_FLAG (op, FLAG_REMOVED);
648
649 op->expmul = 1.0;
650 op->face = blank_face;
651 op->attacked_by_count = -1;
652
653 return op;
654}
655
656/*
657 * If an object with the IS_TURNABLE() flag needs to be turned due 628 * If an object with the IS_TURNABLE() flag needs to be turned due
658 * to the closest player being on the other side, this function can 629 * to the closest player being on the other side, this function can
659 * be called to update the face variable, _and_ how it looks on the map. 630 * be called to update the face variable, _and_ how it looks on the map.
660 */ 631 */
661 632
… …
822 update_now=1; 793 update_now=1;
823 794
824 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) 795 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
825 update_now=1; 796 update_now=1;
826 797
798 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
799 update_now=1;
800
827 if ((move_on | op->move_on) != move_on) update_now=1; 801 if ((move_on | op->move_on) != move_on) update_now=1;
802
828 if ((move_off | op->move_off) != move_off) update_now=1; 803 if ((move_off | op->move_off) != move_off) update_now=1;
804
829 /* This isn't perfect, but I don't expect a lot of objects to 805 /* This isn't perfect, but I don't expect a lot of objects to
830 * to have move_allow right now. 806 * to have move_allow right now.
831 */ 807 */
832 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 808 if (((move_block | op->move_block) & ~op->move_allow) != move_block)
833 update_now=1; 809 update_now=1;
810
834 if ((move_slow | op->move_slow) != move_slow) update_now=1; 811 if ((move_slow | op->move_slow) != move_slow)
812 update_now=1;
835 } 813 }
836 /* if the object is being removed, we can't make intelligent 814 /* if the object is being removed, we can't make intelligent
837 * decisions, because remove_ob can't really pass the object 815 * decisions, because remove_ob can't really pass the object
838 * that is being removed. 816 * that is being removed.
839 */ 817 */
… …
853 831
854 if(op->more!=NULL) 832 if(op->more!=NULL)
855 update_object(op->more, action); 833 update_object(op->more, action);
856} 834}
857 835
836static std::vector<object *> mortals;
837
838void object::free_mortals ()
839{
840 for (std::vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)
841 delete *i;
842
843 mortals.clear ();
844}
845
846object::object ()
847{
848 count = ++ob_count;
849
850 prev = 0;
851 next = objects;
852
853 if (objects)
854 objects->prev = this;
855
856 objects = this;
857
858 SET_FLAG (this, FLAG_REMOVED);
859
860 expmul = 1.0;
861 face = blank_face;
862 attacked_by_count = -1;
863}
864
865object::~object ()
866{
867}
868
869object *object::create ()
870{
871 return new object;
872}
858 873
859/* 874/*
860 * free_object() frees everything allocated by an object, removes 875 * free_object() frees everything allocated by an object, removes
861 * it from the list of used objects, and puts it on the list of 876 * it from the list of used objects, and puts it on the list of
862 * free objects. The IS_FREED() flag is set in the object. 877 * free objects. The IS_FREED() flag is set in the object.
… …
864 * this function to succeed. 879 * this function to succeed.
865 * 880 *
866 * If free_inventory is set, free inventory as well. Else drop items in 881 * If free_inventory is set, free inventory as well. Else drop items in
867 * inventory to the ground. 882 * inventory to the ground.
868 */ 883 */
869
870void 884void
871free_object (object * ob) 885object::free (bool free_inventory)
872{ 886{
873 free_object2 (ob, 0);
874}
875
876void
877free_object2 (object * ob, int free_inventory)
878{
879 object *tmp, *op;
880
881 if (!QUERY_FLAG (ob, FLAG_REMOVED)) 887 if (!QUERY_FLAG (this, FLAG_REMOVED))
882 { 888 {
883 LOG (llevDebug, "Free object called with non removed object\n"); 889 LOG (llevDebug, "Free object called with non removed object\n");
884 dump_object (ob); 890 dump_object (this);
885#ifdef MANY_CORES 891#ifdef MANY_CORES
886 abort (); 892 abort ();
887#endif 893#endif
888 } 894 }
889 895
890 if (QUERY_FLAG (ob, FLAG_FRIENDLY)) 896 if (QUERY_FLAG (this, FLAG_FRIENDLY))
891 { 897 {
892 LOG (llevMonster, "Warning: tried to free friendly object.\n"); 898 LOG (llevMonster, "Warning: tried to free friendly object.\n");
893 remove_friendly_object (ob); 899 remove_friendly_object (this);
894 } 900 }
895 901
896 if (QUERY_FLAG (ob, FLAG_FREED)) 902 if (QUERY_FLAG (this, FLAG_FREED))
897 { 903 {
898 dump_object (ob); 904 dump_object (this);
899 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg); 905 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
900 return; 906 return;
901 } 907 }
902 908
903 if (ob->more != NULL) 909 if (more)
904 { 910 {
905 free_object2 (ob->more, free_inventory); 911 more->free (free_inventory);
906 ob->more = NULL; 912 more = 0;
907 } 913 }
908 914
909 if (ob->inv) 915 if (inv)
910 { 916 {
911 /* Only if the space blocks everything do we not process - 917 /* Only if the space blocks everything do we not process -
912 * if some form of movement is allowed, let objects 918 * if some form of movement is allowed, let objects
913 * drop on that space. 919 * drop on that space.
914 */ 920 */
915 if (free_inventory || ob->map == NULL 921 if (free_inventory || !map
916 || ob->map->in_memory != MAP_IN_MEMORY 922 || map->in_memory != MAP_IN_MEMORY
917 || (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL)) 923 || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
918 { 924 {
919 op = ob->inv; 925 object *op = inv;
920 926
921 while (op != NULL) 927 while (op)
922 { 928 {
923 tmp = op->below; 929 object *tmp = op->below;
924 remove_ob (op); 930 remove_ob (op);
925 free_object2 (op, free_inventory); 931 op->free (free_inventory);
926 op = tmp; 932 op = tmp;
927 } 933 }
928 } 934 }
929 else 935 else
930 { /* Put objects in inventory onto this space */ 936 { /* Put objects in inventory onto this space */
931 op = ob->inv; 937 object *op = inv;
932 938
933 while (op != NULL) 939 while (op)
934 { 940 {
935 tmp = op->below; 941 object *tmp = op->below;
936 remove_ob (op); 942 remove_ob (op);
937 943
938 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 944 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
939 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE 945 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE
940 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 946 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
941 free_object (op); 947 free_object (op);
942 else 948 else
943 { 949 {
944 op->x = ob->x; 950 op->x = x;
945 op->y = ob->y; 951 op->y = y;
946 insert_ob_in_map (op, ob->map, NULL, 0); /* Insert in same map as the envir */ 952 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
947 } 953 }
948 954
949 op = tmp; 955 op = tmp;
950 } 956 }
951 } 957 }
952 } 958 }
953 959
954 /* Remove object from the active list */ 960 /* Remove object from the active list */
955 ob->speed = 0; 961 speed = 0;
956 update_ob_speed (ob); 962 update_ob_speed (this);
957 963
958 SET_FLAG (ob, FLAG_FREED); 964 SET_FLAG (this, FLAG_FREED);
965
966 mortalise ();
967}
968
969void
970object::mortalise ()
971{
959 ob->count = 0; 972 count = 0;
960 973
961 /* Remove this object from the list of used objects */ 974 /* Remove this object from the list of used objects */
962 if (ob->prev == NULL) 975 if (prev) prev->next = next;
963 { 976 if (next) next->prev = prev;
964 objects = ob->next; 977 if (this == objects) objects = next;
965 978
966 if (objects != NULL)
967 objects->prev = NULL;
968 }
969 else
970 {
971 ob->prev->next = ob->next;
972
973 if (ob->next != NULL)
974 ob->next->prev = ob->prev;
975 }
976
977 free_key_values (ob); 979 free_key_values (this);
978 980
979 /* Now link it with the free_objects list: */ 981 mortals.push_back (this);
980 ob->prev = 0;
981 ob->next = 0;
982
983 delete ob;
984} 982}
985 983
986/* 984/*
987 * sub_weight() recursively (outwards) subtracts a number from the 985 * sub_weight() recursively (outwards) subtracts a number from the
988 * weight of an object (and what is carried by it's environment(s)). 986 * weight of an object (and what is carried by it's environment(s)).

Diff Legend

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