… | |
… | |
36 | static const uint64 UUID_GAP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | uint32_t mapspace::smellcount = 10000; |
37 | uint32_t mapspace::smellcount = 10000; |
38 | |
38 | |
39 | objectvec objects; |
39 | objectvec objects; |
40 | activevec actives; |
40 | activevec actives; |
|
|
41 | |
|
|
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
41 | |
47 | |
42 | //+GPL |
48 | //+GPL |
43 | |
49 | |
44 | short freearr_x[SIZEOFFREE] = { |
50 | short freearr_x[SIZEOFFREE] = { |
45 | 0, |
51 | 0, |
… | |
… | |
809 | unlink (); |
815 | unlink (); |
810 | |
816 | |
811 | free_key_values (this); |
817 | free_key_values (this); |
812 | } |
818 | } |
813 | |
819 | |
814 | static int object_count; |
|
|
815 | |
|
|
816 | void object::link () |
820 | void object::link () |
817 | { |
821 | { |
818 | assert (!index);//D |
822 | assert (!index);//D |
819 | uuid = UUID::gen (); |
823 | uuid = UUID::gen (); |
820 | count = ++object_count; |
|
|
821 | |
824 | |
822 | refcnt_inc (); |
825 | refcnt_inc (); |
823 | objects.insert (this); |
826 | objects.insert (this); |
|
|
827 | |
|
|
828 | ++create_count; |
|
|
829 | |
824 | } |
830 | } |
825 | |
831 | |
826 | void object::unlink () |
832 | void object::unlink () |
827 | { |
833 | { |
828 | if (!index) |
834 | if (!index) |
829 | return; |
835 | return; |
|
|
836 | |
|
|
837 | ++destroy_count; |
830 | |
838 | |
831 | objects.erase (this); |
839 | objects.erase (this); |
832 | refcnt_dec (); |
840 | refcnt_dec (); |
833 | } |
841 | } |
834 | |
842 | |
… | |
… | |
960 | // then destroy |
968 | // then destroy |
961 | op->destroy (); |
969 | op->destroy (); |
962 | } |
970 | } |
963 | } |
971 | } |
964 | |
972 | |
|
|
973 | void |
|
|
974 | object::freelist_free (int count) |
|
|
975 | { |
|
|
976 | while (count-- && freelist) |
|
|
977 | { |
|
|
978 | freelist_item *next = freelist->next; |
|
|
979 | // count is being "destroyed" |
|
|
980 | |
|
|
981 | sfree ((char *)freelist, sizeof (object)); |
|
|
982 | |
|
|
983 | freelist = next; |
|
|
984 | --free_count; |
|
|
985 | } |
|
|
986 | } |
|
|
987 | |
|
|
988 | object * |
965 | object *object::create () |
989 | object::create () |
966 | { |
990 | { |
967 | object *op = new object; |
991 | object *op; |
|
|
992 | |
|
|
993 | if (freelist) |
|
|
994 | { |
|
|
995 | freelist_item li = *freelist; |
|
|
996 | memset (freelist, 0, sizeof (object)); |
|
|
997 | |
|
|
998 | op = new (freelist) object; |
|
|
999 | op->count = li.count; |
|
|
1000 | |
|
|
1001 | freelist = li.next; |
|
|
1002 | --free_count; |
|
|
1003 | } |
|
|
1004 | else |
|
|
1005 | { |
|
|
1006 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1007 | |
|
|
1008 | op = new(ni) object; |
|
|
1009 | |
|
|
1010 | op->count = ++object_count; |
|
|
1011 | } |
|
|
1012 | |
968 | op->link (); |
1013 | op->link (); |
|
|
1014 | |
969 | return op; |
1015 | return op; |
|
|
1016 | } |
|
|
1017 | |
|
|
1018 | void |
|
|
1019 | object::do_delete () |
|
|
1020 | { |
|
|
1021 | uint32_t count = this->count; |
|
|
1022 | |
|
|
1023 | this->~object (); |
|
|
1024 | |
|
|
1025 | freelist_item *li = (freelist_item *)this; |
|
|
1026 | li->next = freelist; |
|
|
1027 | li->count = count; |
|
|
1028 | |
|
|
1029 | freelist = li; |
|
|
1030 | ++free_count; |
970 | } |
1031 | } |
971 | |
1032 | |
972 | static struct freed_map : maptile |
1033 | static struct freed_map : maptile |
973 | { |
1034 | { |
974 | freed_map () |
1035 | freed_map () |
… | |
… | |
2677 | } |
2738 | } |
2678 | else |
2739 | else |
2679 | move_type = mt; |
2740 | move_type = mt; |
2680 | } |
2741 | } |
2681 | |
2742 | |
|
|
2743 | /* object should be a player. |
|
|
2744 | * we return the object the player has marked with the 'mark' command |
|
|
2745 | * below. If no match is found (or object has changed), we return |
|
|
2746 | * NULL. We leave it up to the calling function to print messages if |
|
|
2747 | * nothing is found. |
|
|
2748 | */ |
|
|
2749 | object * |
|
|
2750 | object::mark () const |
|
|
2751 | { |
|
|
2752 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2753 | return contr->mark; |
|
|
2754 | else |
|
|
2755 | return 0; |
|
|
2756 | } |
|
|
2757 | |