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.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.92 by root, Tue Dec 26 17:39:29 2006 UTC

… …
778 778
779 prev = 0; 779 prev = 0;
780 next = 0; 780 next = 0;
781} 781}
782 782
783object *object::create ()
784{
785 object *op = new object;
786 op->link ();
787 return op;
788}
789
790void
791object::do_destroy ()
792{
793 attachable::do_destroy ();
794
795 if (flag [FLAG_IS_LINKED])
796 remove_button_link (this);
797
798 if (flag [FLAG_FRIENDLY])
799 remove_friendly_object (this);
800
801 if (!flag [FLAG_REMOVED])
802 remove ();
803
804 if (flag [FLAG_FREED])
805 return;
806
807 flag [FLAG_FREED] = 1;
808
809 while (inv)
810 inv->destroy ();
811
812 set_speed (0);
813 unlink ();
814
815 // hack to ensure that freed objects still have a valid map
816 {
817 static maptile *freed_map; // freed objects are moved here to avoid crashes
818
819 if (!freed_map)
820 {
821 freed_map = new maptile;
822
823 freed_map->name = "/internal/freed_objects_map";
824 freed_map->width = 3;
825 freed_map->height = 3;
826
827 freed_map->allocate ();
828 }
829
830 map = freed_map;
831 x = 1;
832 y = 1;
833 }
834
835 head = 0;
836
837 if (more)
838 {
839 more->destroy ();
840 more = 0;
841 }
842
843 // clear those pointers that likely might have circular references to us
844 owner = 0;
845 enemy = 0;
846 attacked_by = 0;
847
848 // only relevant for players(?), but make sure of it anyways
849 contr = 0;
850}
851
852/* 783/*
853 * Remove and free all objects in the inventory of the given object. 784 * Remove and free all objects in the inventory of the given object.
854 * object.c ? 785 * object.c ?
855 */ 786 */
856void 787void
… …
858{ 789{
859 /* Only if the space blocks everything do we not process - 790 /* Only if the space blocks everything do we not process -
860 * if some form of movement is allowed, let objects 791 * if some form of movement is allowed, let objects
861 * drop on that space. 792 * drop on that space.
862 */ 793 */
863 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 794 if (!drop_to_ground
795 || !map
796 || map->in_memory != MAP_IN_MEMORY
797 || map->at (x, y).move_block == MOVE_ALL)
864 { 798 {
865 while (inv) 799 while (inv)
800 {
801 inv->destroy_inv (drop_to_ground);
866 inv->destroy (); 802 inv->destroy ();
803 }
867 } 804 }
868 else 805 else
869 { /* Put objects in inventory onto this space */ 806 { /* Put objects in inventory onto this space */
870 while (inv) 807 while (inv)
871 { 808 {
… …
886 } 823 }
887 } 824 }
888 } 825 }
889} 826}
890 827
828object *object::create ()
829{
830 object *op = new object;
831 op->link ();
832 return op;
833}
834
835void
836object::do_destroy ()
837{
838 if (flag [FLAG_IS_LINKED])
839 remove_button_link (this);
840
841 if (flag [FLAG_FRIENDLY])
842 remove_friendly_object (this);
843
844 if (!flag [FLAG_REMOVED])
845 remove ();
846
847 if (flag [FLAG_FREED])
848 return;
849
850 set_speed (0);
851
852 flag [FLAG_FREED] = 1;
853
854 attachable::do_destroy ();
855
856 destroy_inv (true);
857 unlink ();
858
859 // hack to ensure that freed objects still have a valid map
860 {
861 static maptile *freed_map; // freed objects are moved here to avoid crashes
862
863 if (!freed_map)
864 {
865 freed_map = new maptile;
866
867 freed_map->name = "/internal/freed_objects_map";
868 freed_map->width = 3;
869 freed_map->height = 3;
870
871 freed_map->allocate ();
872 }
873
874 map = freed_map;
875 x = 1;
876 y = 1;
877 }
878
879 head = 0;
880
881 if (more)
882 {
883 more->destroy ();
884 more = 0;
885 }
886
887 // clear those pointers that likely might have circular references to us
888 owner = 0;
889 enemy = 0;
890 attacked_by = 0;
891
892 // only relevant for players(?), but make sure of it anyways
893 contr = 0;
894}
895
891void 896void
892object::destroy (bool destroy_inventory) 897object::destroy (bool destroy_inventory)
893{ 898{
894 if (destroyed ()) 899 if (destroyed ())
895 return; 900 return;
896 901
897 if (destroy_inventory) 902 if (destroy_inventory)
898 destroy_inv (true); 903 destroy_inv (false);
899 904
900 attachable::destroy (); 905 attachable::destroy ();
901} 906}
902 907
903/* 908/*
… …
1016 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1017 return; 1022 return;
1018 1023
1019 int check_walk_off = !flag [FLAG_NO_APPLY]; 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1020 1025
1021 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1026 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1022 { 1027 {
1023 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1024 * being removed. 1029 * being removed.
1025 */ 1030 */
1026 1031

Diff Legend

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