… | |
… | |
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, |
… | |
… | |
477 | |
483 | |
478 | sum = weight_adjust_for (this, sum); |
484 | sum = weight_adjust_for (this, sum); |
479 | |
485 | |
480 | if (sum != carrying) |
486 | if (sum != carrying) |
481 | { |
487 | { |
|
|
488 | if (carrying != sum)//D |
|
|
489 | LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", |
|
|
490 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
491 | |
482 | carrying = sum; |
492 | carrying = sum; |
483 | |
493 | |
484 | if (object *pl = visible_to ()) |
494 | if (object *pl = visible_to ()) |
485 | if (pl != this) // player is handled lazily |
495 | if (pl != this) // player is handled lazily |
486 | esrv_update_item (UPD_WEIGHT, pl, this); |
496 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
809 | unlink (); |
819 | unlink (); |
810 | |
820 | |
811 | free_key_values (this); |
821 | free_key_values (this); |
812 | } |
822 | } |
813 | |
823 | |
814 | static int object_count; |
|
|
815 | |
|
|
816 | void object::link () |
824 | void object::link () |
817 | { |
825 | { |
818 | assert (!index);//D |
826 | assert (!index);//D |
819 | uuid = UUID::gen (); |
827 | uuid = UUID::gen (); |
820 | count = ++object_count; |
|
|
821 | |
828 | |
822 | refcnt_inc (); |
829 | refcnt_inc (); |
823 | objects.insert (this); |
830 | objects.insert (this); |
|
|
831 | |
|
|
832 | ++create_count; |
|
|
833 | |
824 | } |
834 | } |
825 | |
835 | |
826 | void object::unlink () |
836 | void object::unlink () |
827 | { |
837 | { |
828 | if (!index) |
838 | if (!index) |
829 | return; |
839 | return; |
|
|
840 | |
|
|
841 | ++destroy_count; |
830 | |
842 | |
831 | objects.erase (this); |
843 | objects.erase (this); |
832 | refcnt_dec (); |
844 | refcnt_dec (); |
833 | } |
845 | } |
834 | |
846 | |
… | |
… | |
960 | // then destroy |
972 | // then destroy |
961 | op->destroy (); |
973 | op->destroy (); |
962 | } |
974 | } |
963 | } |
975 | } |
964 | |
976 | |
|
|
977 | void |
|
|
978 | object::freelist_free (int count) |
|
|
979 | { |
|
|
980 | while (count-- && freelist) |
|
|
981 | { |
|
|
982 | freelist_item *next = freelist->next; |
|
|
983 | // count is being "destroyed" |
|
|
984 | |
|
|
985 | sfree ((char *)freelist, sizeof (object)); |
|
|
986 | |
|
|
987 | freelist = next; |
|
|
988 | --free_count; |
|
|
989 | } |
|
|
990 | } |
|
|
991 | |
|
|
992 | object * |
965 | object *object::create () |
993 | object::create () |
966 | { |
994 | { |
967 | object *op = new object; |
995 | object *op; |
|
|
996 | |
|
|
997 | if (freelist) |
|
|
998 | { |
|
|
999 | freelist_item li = *freelist; |
|
|
1000 | memset (freelist, 0, sizeof (object)); |
|
|
1001 | |
|
|
1002 | op = new (freelist) object; |
|
|
1003 | op->count = li.count; |
|
|
1004 | |
|
|
1005 | freelist = li.next; |
|
|
1006 | --free_count; |
|
|
1007 | } |
|
|
1008 | else |
|
|
1009 | { |
|
|
1010 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1011 | |
|
|
1012 | op = new(ni) object; |
|
|
1013 | |
|
|
1014 | op->count = ++object_count; |
|
|
1015 | } |
|
|
1016 | |
968 | op->link (); |
1017 | op->link (); |
|
|
1018 | |
969 | return op; |
1019 | return op; |
970 | } |
1020 | } |
971 | |
1021 | |
|
|
1022 | void |
|
|
1023 | object::do_delete () |
|
|
1024 | { |
|
|
1025 | uint32_t count = this->count; |
|
|
1026 | |
|
|
1027 | this->~object (); |
|
|
1028 | |
|
|
1029 | freelist_item *li = (freelist_item *)this; |
|
|
1030 | li->next = freelist; |
|
|
1031 | li->count = count; |
|
|
1032 | |
|
|
1033 | freelist = li; |
|
|
1034 | ++free_count; |
|
|
1035 | } |
|
|
1036 | |
972 | static struct freed_map : maptile |
1037 | static struct freed_map : maptile |
973 | { |
1038 | { |
974 | freed_map () |
1039 | freed_map () |
|
|
1040 | : maptile (3, 3) |
975 | { |
1041 | { |
976 | path = "<freed objects map>"; |
1042 | path = "<freed objects map>"; |
977 | name = "/internal/freed_objects_map"; |
1043 | name = "/internal/freed_objects_map"; |
978 | width = 3; |
|
|
979 | height = 3; |
|
|
980 | no_drop = 1; |
1044 | no_drop = 1; |
981 | no_reset = 1; |
1045 | no_reset = 1; |
982 | |
1046 | |
983 | alloc (); |
|
|
984 | in_memory = MAP_ACTIVE; |
1047 | in_memory = MAP_ACTIVE; |
985 | } |
1048 | } |
986 | |
1049 | |
987 | ~freed_map () |
1050 | ~freed_map () |
988 | { |
1051 | { |
… | |
… | |
2677 | } |
2740 | } |
2678 | else |
2741 | else |
2679 | move_type = mt; |
2742 | move_type = mt; |
2680 | } |
2743 | } |
2681 | |
2744 | |
|
|
2745 | /* object should be a player. |
|
|
2746 | * we return the object the player has marked with the 'mark' command |
|
|
2747 | * below. If no match is found (or object has changed), we return |
|
|
2748 | * NULL. We leave it up to the calling function to print messages if |
|
|
2749 | * nothing is found. |
|
|
2750 | */ |
|
|
2751 | object * |
|
|
2752 | object::mark () const |
|
|
2753 | { |
|
|
2754 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2755 | return contr->mark; |
|
|
2756 | else |
|
|
2757 | return 0; |
|
|
2758 | } |
|
|
2759 | |