Move some stuff in types.hpp

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;

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 {

src/DivaGL/types.hpp

@@ -62,6 +62,9 @@ bool operator!=(Allocator<T> const& x, Allocator<U> const& y) noexcept {
 }
 
 namespace prj {
+    template<typename T, typename U>
+    using pair = std::pair<T, U>;
+
     using string = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
 
     template<typename T>
@@ -71,8 +74,10 @@ namespace prj {
     using list = std::list<T, Allocator<T>>;
 
     template<typename T, typename U>
-    using map = std::map<T, U, Allocator<std::pair<T, U>>>;
-
-    template<typename T, typename U>
-    using pair = std::pair<T, U>;
+    using map = std::map<T, U, std::less<T>, Allocator<pair<T, U>>>;
 }
+
+struct shared_ptr_prj__stack_allocator {
+    void* ptr;
+    void* ref;
+};