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.20 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.23 by root, Sun Sep 10 14:54:02 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.20 2006/09/08 18:26:22 root Exp $"; 3 * "$Id: object.C,v 1.23 2006/09/10 14:54:02 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
… …
530 SET_FLAG (this, FLAG_REMOVED); 529 SET_FLAG (this, FLAG_REMOVED);
531} 530}
532 531
533void object::clone (object *destination) 532void object::clone (object *destination)
534{ 533{
535 *(object_copy *)destination = *(object_copy *)this; 534 *(object_copy *)destination = *this;
536 *(object_pod *)destination = *(object_pod *)this; 535 *(object_pod *)destination = *this;
537 536
538 if (self || cb) 537 if (self || cb)
539 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 538 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
540} 539}
541 540
… …
591 590
592 if (op2->speed < 0) 591 if (op2->speed < 0)
593 op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0; 592 op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;
594 593
595 /* Copy over key_values, if any. */ 594 /* Copy over key_values, if any. */
596 if (op2->key_values != NULL) 595 if (op2->key_values)
597 { 596 {
598 key_value *tail = NULL; 597 key_value *tail = 0;
599 key_value *i; 598 key_value *i;
600 599
601 op->key_values = NULL; 600 op->key_values = 0;
602 601
603 for (i = op2->key_values; i != NULL; i = i->next) 602 for (i = op2->key_values; i; i = i->next)
604 { 603 {
605 key_value *new_link = new key_value; 604 key_value *new_link = new key_value;
606 605
607 new_link->next = NULL; 606 new_link->next = 0;
608 new_link->key = i->key; 607 new_link->key = i->key;
609 new_link->value = i->value; 608 new_link->value = i->value;
610 609
611 /* Try and be clever here, too. */ 610 /* Try and be clever here, too. */
612 if (op->key_values == NULL) 611 if (!op->key_values)
613 { 612 {
614 op->key_values = new_link; 613 op->key_values = new_link;
615 tail = new_link; 614 tail = new_link;
616 } 615 }
617 else 616 else
… …
621 } 620 }
622 } 621 }
623 } 622 }
624 623
625 update_ob_speed (op); 624 update_ob_speed (op);
626}
627
628object::object ()
629{
630 count = ++ob_count;
631
632 next = objects;
633
634 if (objects)
635 objects->prev = this;
636
637 objects = this;
638
639 SET_FLAG (this, FLAG_REMOVED);
640
641 expmul = 1.0;
642 face = blank_face;
643 attacked_by_count = -1;
644}
645
646object::~object ()
647{
648} 625}
649 626
650/* 627/*
651 * 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
652 * 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
… …
854 831
855 if(op->more!=NULL) 832 if(op->more!=NULL)
856 update_object(op->more, action); 833 update_object(op->more, action);
857} 834}
858 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 SET_FLAG (this, FLAG_REMOVED);
849
850 expmul = 1.0;
851 face = blank_face;
852 attacked_by_count = -1;
853}
854
855object::~object ()
856{
857 free_key_values (this);
858}
859
860void
861object::link ()
862{
863 count = ++ob_count;
864
865 prev = 0;
866 next = objects;
867
868 if (objects)
869 objects->prev = this;
870
871 objects = this;
872}
873
874void
875object::unlink ()
876{
877 count = 0;
878
879 /* Remove this object from the list of used objects */
880 if (prev) prev->next = next;
881 if (next) next->prev = prev;
882 if (this == objects) objects = next;
883}
884
885object *object::create ()
886{
887 object *op = new object;
888 op->link ();
889 return op;
890}
859 891
860/* 892/*
861 * free_object() frees everything allocated by an object, removes 893 * free_object() frees everything allocated by an object, removes
862 * it from the list of used objects, and puts it on the list of 894 * it from the list of used objects, and puts it on the list of
863 * free objects. The IS_FREED() flag is set in the object. 895 * free objects. The IS_FREED() flag is set in the object.
… …
865 * this function to succeed. 897 * this function to succeed.
866 * 898 *
867 * If free_inventory is set, free inventory as well. Else drop items in 899 * If free_inventory is set, free inventory as well. Else drop items in
868 * inventory to the ground. 900 * inventory to the ground.
869 */ 901 */
870
871void 902void
872free_object (object * ob) 903object::free (bool free_inventory)
873{ 904{
874 free_object2 (ob, 0);
875}
876
877void
878free_object2 (object * ob, int free_inventory)
879{
880 object *tmp, *op;
881
882 if (!QUERY_FLAG (ob, FLAG_REMOVED)) 905 if (!QUERY_FLAG (this, FLAG_REMOVED))
883 { 906 {
884 LOG (llevDebug, "Free object called with non removed object\n"); 907 LOG (llevDebug, "Free object called with non removed object\n");
885 dump_object (ob); 908 dump_object (this);
886#ifdef MANY_CORES 909#ifdef MANY_CORES
887 abort (); 910 abort ();
888#endif 911#endif
889 } 912 }
890 913
891 if (QUERY_FLAG (ob, FLAG_FRIENDLY)) 914 if (QUERY_FLAG (this, FLAG_FRIENDLY))
892 { 915 {
893 LOG (llevMonster, "Warning: tried to free friendly object.\n"); 916 LOG (llevMonster, "Warning: tried to free friendly object.\n");
894 remove_friendly_object (ob); 917 remove_friendly_object (this);
895 } 918 }
896 919
897 if (QUERY_FLAG (ob, FLAG_FREED)) 920 if (QUERY_FLAG (this, FLAG_FREED))
898 { 921 {
899 dump_object (ob); 922 dump_object (this);
900 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg); 923 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
901 return; 924 return;
902 } 925 }
903 926
904 if (ob->more != NULL) 927 if (more)
905 { 928 {
906 free_object2 (ob->more, free_inventory); 929 more->free (free_inventory);
907 ob->more = NULL; 930 more = 0;
908 } 931 }
909 932
910 if (ob->inv) 933 if (inv)
911 { 934 {
912 /* Only if the space blocks everything do we not process - 935 /* Only if the space blocks everything do we not process -
913 * if some form of movement is allowed, let objects 936 * if some form of movement is allowed, let objects
914 * drop on that space. 937 * drop on that space.
915 */ 938 */
916 if (free_inventory || ob->map == NULL 939 if (free_inventory || !map
917 || ob->map->in_memory != MAP_IN_MEMORY 940 || map->in_memory != MAP_IN_MEMORY
918 || (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL)) 941 || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
919 { 942 {
920 op = ob->inv; 943 object *op = inv;
921 944
922 while (op != NULL) 945 while (op)
923 { 946 {
924 tmp = op->below; 947 object *tmp = op->below;
925 remove_ob (op); 948 remove_ob (op);
926 free_object2 (op, free_inventory); 949 op->free (free_inventory);
927 op = tmp; 950 op = tmp;
928 } 951 }
929 } 952 }
930 else 953 else
931 { /* Put objects in inventory onto this space */ 954 { /* Put objects in inventory onto this space */
932 op = ob->inv; 955 object *op = inv;
933 956
934 while (op != NULL) 957 while (op)
935 { 958 {
936 tmp = op->below; 959 object *tmp = op->below;
937 remove_ob (op); 960 remove_ob (op);
938 961
939 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 962 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
940 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE 963 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE
941 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 964 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
942 free_object (op); 965 free_object (op);
943 else 966 else
944 { 967 {
945 op->x = ob->x; 968 op->x = x;
946 op->y = ob->y; 969 op->y = y;
947 insert_ob_in_map (op, ob->map, NULL, 0); /* Insert in same map as the envir */ 970 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
948 } 971 }
949 972
950 op = tmp; 973 op = tmp;
951 } 974 }
952 } 975 }
953 } 976 }
954 977
955 /* Remove object from the active list */ 978 /* Remove object from the active list */
956 ob->speed = 0; 979 speed = 0;
957 update_ob_speed (ob); 980 update_ob_speed (this);
958 981
982 unlink ();
983
959 SET_FLAG (ob, FLAG_FREED); 984 SET_FLAG (this, FLAG_FREED);
960 ob->count = 0;
961 985
962 /* Remove this object from the list of used objects */ 986 mortals.push_back (this);
963 if (ob->prev == NULL)
964 {
965 objects = ob->next;
966
967 if (objects != NULL)
968 objects->prev = NULL;
969 }
970 else
971 {
972 ob->prev->next = ob->next;
973
974 if (ob->next != NULL)
975 ob->next->prev = ob->prev;
976 }
977
978 free_key_values (ob);
979
980 /* Now link it with the free_objects list: */
981 ob->prev = 0;
982 ob->next = 0;
983
984 delete ob;
985} 987}
986 988
987/* 989/*
988 * sub_weight() recursively (outwards) subtracts a number from the 990 * sub_weight() recursively (outwards) subtracts a number from the
989 * weight of an object (and what is carried by it's environment(s)). 991 * weight of an object (and what is carried by it's environment(s)).

Diff Legend

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