diff --git a/src/DivaGL/object.cpp b/src/DivaGL/object.cpp index ad7c05a..f6209b3 100644 --- a/src/DivaGL/object.cpp +++ b/src/DivaGL/object.cpp @@ -17,11 +17,6 @@ struct BufObjMgr { int32_t ib_all_size; }; -struct shared_ptr_prj__stack_allocator { - void* ptr; - void* ref; -}; - struct ObjsetInfo { p_file_handler obj_file_handler; bool obj_loaded; diff --git a/src/DivaGL/sprite.hpp b/src/DivaGL/sprite.hpp index 36e4b1b..dcffa41 100644 --- a/src/DivaGL/sprite.hpp +++ b/src/DivaGL/sprite.hpp @@ -66,11 +66,6 @@ struct SpriteHeader { SpriteData* sprdata; }; -struct shared_ptr_prj__stack_allocator { - void* ptr; - void* ref; -}; - struct SprSet { void* vftable; int32_t flag; @@ -152,6 +147,10 @@ namespace spr { SPR_PRIO_30, SPR_PRIO_31, SPR_PRIO_MAX, + + SPR_PRIO_BACKGROUND = SPR_PRIO_03, + SPR_PRIO_DEFAULT = SPR_PRIO_07, + SPR_PRIO_DEBUG = SPR_PRIO_29, }; struct SpriteVertex { diff --git a/src/DivaGL/types.hpp b/src/DivaGL/types.hpp index 813b408..296fa97 100644 --- a/src/DivaGL/types.hpp +++ b/src/DivaGL/types.hpp @@ -62,6 +62,9 @@ bool operator!=(Allocator const& x, Allocator const& y) noexcept { } namespace prj { + template + using pair = std::pair; + using string = std::basic_string, Allocator>; template @@ -71,8 +74,10 @@ namespace prj { using list = std::list>; template - using map = std::map>>; - - template - using pair = std::pair; + using map = std::map, Allocator>>; } + +struct shared_ptr_prj__stack_allocator { + void* ptr; + void* ref; +};