tier1: fix up offset padding.

blueblur0730 · blueblur0730 · commit 657250c494b1 · 2025-11-14T21:29:15.000+08:00
diff --git a/include/tier1/utl_dict.inc b/include/tier1/utl_dict.inc
@@ -12,13 +12,13 @@
 #pragma semicolon 1
 
 #define UTL_DICT_TAG "[UtlDict]"
-#define UTL_DICT_VERSION "1.0.0"
+#define UTL_DICT_VERSION "1.0.1"
 
 /**
  * Author: blueblur
  * Date: 2025-11-14
  * url: https://github.com/blueblur0730/modified-plugins
- * Version: 1.0.0
+ * Version: 1.0.1
 */
 
 enum EDictCompareType
@@ -64,8 +64,12 @@ methodmap UtlDict < AddressBase {
     */
     }
 
-    public any Element(int i, int size = 4, NumberType type = NumberType_Int32) {
-        return this.m_Elements.Element(i, size, type);
+    public any Element(int i, int size, int keySize, NumberType type = NumberType_Int32) {
+        return this.m_Elements.Element(i, size, keySize, type);
+    }
+
+    public any ElementEx(int i, int size, int keySize) {
+        return this.m_Elements.GetElementEx(i, size, keySize);
     }
 
     public Stringt GetElementName(int i, int size = 4, NumberType type = NumberType_Int32) {
@@ -170,8 +174,8 @@ methodmap UtlDict < AddressBase {
 
             // delete m_Elements[index];
             if (bAlwaysFreeElems && destructor) {
-                any elem = this.m_Elements.GetElement(index, elemSize, elementSize);
-                any elemAddr = this.m_Elements.GetElementEx(index, elemSize);
+                any elem = this.m_Elements.GetElement(index, elemSize, keySize, elementSize);
+                any elemAddr = this.m_Elements.GetElementEx(index, elemSize, keySize);
 
                 this.m_Elements.Destruct(index, elemSize, elemAddr, elem, destructor);
             }
diff --git a/include/tier1/utl_map.inc b/include/tier1/utl_map.inc
@@ -12,7 +12,7 @@
 #pragma semicolon 1
 
 #define UTL_MAP_TAG "[UtlMap]"
-#define UTL_MAP_VERSION "1.0.0"
+#define UTL_MAP_VERSION "1.0.2"
 
 /**
  * Author: blueblur
@@ -80,9 +80,6 @@ protected:
 */
 typedef UtlMapDestructorFunc = function void (UtlMap vec, int i, any addr, any obj, int size);
 
-//#define NODET_OFFSET_KEY 0x0
-#define NODET_OFFSET_ELEM 0x4
-
 methodmap Node_t < AddressBase {
     public Node_t(Address addr) {
         Node_t p = view_as<Node_t>(addr);
@@ -106,21 +103,19 @@ methodmap Node_t < AddressBase {
         StoreToAddress(this.addr, value, elementSize);
     }
 
-    public any GetElem(NumberType elementSize = NumberType_Int32) {
-        return LoadFromAddress(this.addr + NODET_OFFSET_ELEM, elementSize);
+    public any GetElem(int keySize, NumberType elementSize = NumberType_Int32) {
+        return LoadFromAddress(this.addr + keySize, elementSize);
     }
 
-    public any GetElemEx() {
-        return this.addr + NODET_OFFSET_ELEM;
+    public any GetElemEx(int keySize) {
+        return this.addr + keySize;
     }
 
-    public void SetElem(any value, NumberType elementSize = NumberType_Int32) {
-        StoreToAddress(this.addr + NODET_OFFSET_ELEM, value, elementSize);
+    public void SetElem(any value, int keySize, NumberType elementSize = NumberType_Int32) {
+        StoreToAddress(this.addr + keySize, value, elementSize);
     }
 }
 
-#define UTL_MAP_OFFSET_TREE 0x0
-
 methodmap UtlMap < AddressBase {
     public UtlMap(Address addr) {
         UtlMap p = view_as<UtlMap>(addr);
@@ -145,32 +140,32 @@ methodmap UtlMap < AddressBase {
 #endif
     }
 
-    public any GetElement(int i, int size, NumberType elementSize = NumberType_Int32) {
-        return view_as<Node_t>(this.m_Tree.Get(i, size)).GetElem(elementSize);
+    public any GetElement(int i, int size, int keySize, NumberType elementSize = NumberType_Int32) {
+        return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetElem(keySize, elementSize);
     }
 
-    public any GetElementEx(int i, int size) {
-        return view_as<Node_t>(this.m_Tree.Get(i, size)).GetElemEx();
+    public any GetElementEx(int i, int size, int keySize) {
+        return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetElemEx(keySize);
     }
 
-    public void SetElement(int i, any value, int size, NumberType elementSize = NumberType_Int32) {
-        view_as<Node_t>(this.m_Tree.Get(i, size)).SetElem(value, elementSize);
+    public void SetElement(int i, any value, int size, int keySize, NumberType elementSize = NumberType_Int32) {
+        view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).SetElem(value, keySize, elementSize);
     }
 
     public any GetKey(int i, int size, NumberType elementSize = NumberType_Int32) {
-        return view_as<Node_t>(this.m_Tree.Get(i, size)).GetKey(elementSize);
+        return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetKey(elementSize);
     }
 
     public any GetKeyEx(int i, int size) {
-        return view_as<Node_t>(this.m_Tree.Get(i, size)).GetKeyEx();
+        return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetKeyEx();
     }
 
     public void SetKey(int i, any value, int size, NumberType elementSize = NumberType_Int32) {
-        view_as<Node_t>(this.m_Tree.Get(i, size)).SetKey(value, elementSize);
+        view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).SetKey(value, elementSize);
     }
 
-    public any Element(int i, int size, NumberType elementSize = NumberType_Int32) {
-        return this.GetElement(i, size, elementSize);
+    public any Element(int i, int size, int keySize, NumberType elementSize = NumberType_Int32) {
+        return this.GetElement(i, size, keySize, elementSize);
     }
 
     public any Key(int i, int size, NumberType elementSize = NumberType_Int32) {
@@ -301,7 +296,7 @@ methodmap UtlMap < AddressBase {
             return defaultValue;
         }
 
-        return this.GetElement(i, insertSize, numberType);
+        return this.GetElement(i, insertSize, keySize, numberType);
     }
 
     public int FindClosest(any key, int keySize, int insertSize, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {
@@ -430,7 +425,7 @@ methodmap UtlMap < AddressBase {
             return defaultValue;
         }
 
-        return this.GetElement(i, insertSize, numberType);
+        return this.GetElement(i, insertSize, keySize, numberType);
     }
 
     public int FindClosest(any key, int keySize, int insertSize, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {
@@ -501,13 +496,13 @@ methodmap UtlMap < AddressBase {
         return this.m_Tree.FindFirst(obj, size, numberType);
     }
 
-    public any FindElementSafe(any obj, int size, NumberType numberType = NumberType_Int32, any defaultValue = 0) {
+    public any FindElementSafe(any obj, int size, int keySize, NumberType numberType = NumberType_Int32, any defaultValue = 0) {
         int i = this.FindSafe(obj, size, numberType);
         if (i == UtlRBTree.InvalidIndex()) {
             return defaultValue;
         }
 
-        return this.GetElement(i, size, numberType);
+        return this.GetElement(i, size, keySize, numberType);
     }
 
     public int FindClosestSafe(any obj, int size, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {
@@ -543,8 +538,8 @@ methodmap UtlMap < AddressBase {
                 continue; 
 
             if (bAlwaysFreeElems && destructor) {
-                any elem = this.GetElement(i, keySize + elemSize, elementSize);
-                any elemAddr = this.GetElementEx(i, keySize + elemSize);
+                any elem = this.GetElement(i, keySize + elemSize, keySize, elementSize);
+                any elemAddr = this.GetElementEx(i, keySize + elemSize, keySize);
 
                 this.Destruct(i, elemSize, elemAddr, elem, destructor);
             }
diff --git a/include/tier1/utl_rbtree.inc b/include/tier1/utl_rbtree.inc
@@ -12,13 +12,13 @@
 #pragma semicolon 1
 
 #define UTL_RBTREE_TAG "[UtlRBTree]"
-#define UTL_RBTREE_VERSION "1.3.0"
+#define UTL_RBTREE_VERSION "1.3.3"
 
 /**
  * Author: blueblur
  * Date: 2025-11-11
  * url: https://github.com/blueblur0730/modified-plugins
- * Version: 1.3.2
+ * Version: 1.3.3
 */
 
 /*
@@ -29,27 +29,27 @@
     LessFunc_t m_LessFunc;  // this + 0x0 / 0
     M m_Elements;           // this + 0x4 / 4, size is 0xC
     I m_Root;               // this + 0x10 / 16
-    I m_NumElements;        // this + 0x14 / 20
-    I m_FirstFree;          // this + 0x18 / 24
-    typename M::Iterator_t m_LastAlloc; // this + 0x1C / 28, the last index allocated.
+    I m_NumElements;        // this + 0x12 / 18
+    I m_FirstFree;          // this + 0x14 / 20
+    typename M::Iterator_t m_LastAlloc; // this + 0x18 / 22, the last index allocated.
 
-    Node_t* m_pElements;    // this + 0x20 / 32.
+    Node_t* m_pElements;    // this + 0x1A / 24.
 
-    // whole size is 36.
+    // whole size is 28.
 */
 
 /*
-    // size is 16.
+    // size is 8.
     template < class I >
     struct UtlRBTreeLinks_t
     {
-        I  m_Left;
-        I  m_Right;
-        I  m_Parent;
-        I  m_Tag;
+        I  m_Left;      // this + 0x0 / 0
+        I  m_Right;     // this + 0x2 / 2
+        I  m_Parent;    // this + 0x4 / 4
+        I  m_Tag;       // this + 0x6 / 6
     };
 
-    // size is 16 + sizeof(T).
+    // size is 8 + sizeof(T).
     template < class T, class I >
     struct UtlRBTreeNode_t : public UtlRBTreeLinks_t< I >
     {
@@ -63,7 +63,7 @@
 */
 
 /*
-    // size is 4.
+    // size is 2.
 	class Iterator_t
 	{
 	public:
@@ -152,9 +152,9 @@ methodmap Iterator_t < AddressBase {
 }
 
 #define UTL_RBTREE_LINKS_OFFSET_LEFT 0x0
-#define UTL_RBTREE_LINKS_OFFSET_RIGHT 0x4
-#define UTL_RBTREE_LINKS_OFFSET_PARENT 0x8
-#define UTL_RBTREE_LINKS_OFFSET_TAG 0xC
+#define UTL_RBTREE_LINKS_OFFSET_RIGHT 0x2
+#define UTL_RBTREE_LINKS_OFFSET_PARENT 0x4
+#define UTL_RBTREE_LINKS_OFFSET_TAG 0x6
 methodmap UtlRBTreeLinks_t < AddressBase {
     property int m_Left {
         public get() {
@@ -197,7 +197,7 @@ methodmap UtlRBTreeLinks_t < AddressBase {
     }
 }
 
-#define UTL_RBTREE_NODE_OFFSET_DATA 0x10
+#define UTL_RBTREE_NODE_OFFSET_DATA 0x8
 methodmap UtlRBTreeNode_t < UtlRBTreeLinks_t {
     property any m_Data {
         public get() {
@@ -228,10 +228,10 @@ methodmap UtlRBTreeNode_t < UtlRBTreeLinks_t {
 #define UTL_RBTREE_OFFSET_ALLOCATION_COUNT  0x8
 #define UTL_RBTREE_OFFSET_GROWSIZE          0xC
 #define UTL_RBTREE_OFFSET_ROOT              0x10
-#define UTL_RBTREE_OFFSET_NUM_ELEMENTS      0x14
-#define UTL_RBTREE_OFFSET_FIRST_FREE        0x18
-#define UTL_RBTREE_OFFSET_LAST_ALLOC        0x1C
-#define UTL_RBTREE_OFFSET_ELEMENTS          0x20
+#define UTL_RBTREE_OFFSET_NUM_ELEMENTS      0x12
+#define UTL_RBTREE_OFFSET_FIRST_FREE        0x14
+#define UTL_RBTREE_OFFSET_LAST_ALLOC        0x16
+#define UTL_RBTREE_OFFSET_ELEMENTS          0x18
 
 /**
  * all allocation or deallocation access requires SM-Memory extension to work.
@@ -361,17 +361,17 @@ methodmap UtlRBTree < AddressBase {
 
     public any Get(int i, int size = 4, NumberType elementSize = NumberType_Int32) {
         Assert(this.IsValidIndex(i, size), UTL_RBTREE_TAG, "Param index (%d) out of bounds. m_nAllocationCount: [0 - %d], m_LastAlloc: [0 - %d].", i, this.m_nAllocationCount, this.m_LastAlloc);
-        return view_as<UtlRBTreeNode_t>(view_as<any>(this.m_pMemory) + i * size).GetData(elementSize);
+        return view_as<UtlRBTreeNode_t>(view_as<any>(this.m_pMemory) + i * (8 + size)).GetData(elementSize);
     }
 
     public void Set(int i, int size = 4, any val, NumberType elementSize = NumberType_Int32) {
         Assert(this.IsValidIndex(i, size), UTL_RBTREE_TAG, "Param index (%d) out of bounds. m_nAllocationCount: [0 - %d], m_LastAlloc: [0 - %d].", i, this.m_nAllocationCount, this.m_LastAlloc);
-        view_as<UtlRBTreeNode_t>(view_as<any>(this.m_pMemory) + i * size).SetData(val, elementSize);
+        view_as<UtlRBTreeNode_t>(view_as<any>(this.m_pMemory) + i * (8 + size)).SetData(val, elementSize);
     }
 
     public any GetEx(int i, int size = 4) {
         Assert(this.IsValidIndex(i, size), UTL_RBTREE_TAG, "Param index (%d) out of bounds. m_nAllocationCount: [0 - %d], m_LastAlloc: [0 - %d].", i, this.m_nAllocationCount, this.m_LastAlloc);
-        return view_as<UtlRBTreeNode_t>(view_as<any>(this.m_pMemory) + i * size).GetDataAddress();
+        return view_as<any>(this.m_pMemory) + i * (8 + size);
     }
 
     public any Element(int i, int size = 4, NumberType elementSize = NumberType_Int32) {
diff --git a/source/nmrih_allow_cheated_achivement/gamedata/nmrih_allow_cheated_achivement.txt b/source/nmrih_allow_cheated_achivement/gamedata/nmrih_allow_cheated_achivement.txt

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#pragma semicolon 1`
`13`	`13`
`14`	`14`	`#define UTL_MAP_TAG "[UtlMap]"`
`15`		`-#define UTL_MAP_VERSION "1.0.0"`
	`15`	`+#define UTL_MAP_VERSION "1.0.2"`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Author: blueblur`
`@@ -80,9 +80,6 @@ protected:`
`80`	`80`	`*/`
`81`	`81`	`typedef UtlMapDestructorFunc = function void (UtlMap vec, int i, any addr, any obj, int size);`
`82`	`82`
`83`		`-//#define NODET_OFFSET_KEY 0x0`
`84`		`-#define NODET_OFFSET_ELEM 0x4`
`85`		`-`
`86`	`83`	`methodmap Node_t < AddressBase {`
`87`	`84`	`public Node_t(Address addr) {`
`88`	`85`	`Node_t p = view_as<Node_t>(addr);`
`@@ -106,21 +103,19 @@ methodmap Node_t < AddressBase {`
`106`	`103`	`StoreToAddress(this.addr, value, elementSize);`
`107`	`104`	`}`
`108`	`105`
`109`		`- public any GetElem(NumberType elementSize = NumberType_Int32) {`
`110`		`- return LoadFromAddress(this.addr + NODET_OFFSET_ELEM, elementSize);`
	`106`	`+ public any GetElem(int keySize, NumberType elementSize = NumberType_Int32) {`
	`107`	`+ return LoadFromAddress(this.addr + keySize, elementSize);`
`111`	`108`	`}`
`112`	`109`
`113`		`- public any GetElemEx() {`
`114`		`- return this.addr + NODET_OFFSET_ELEM;`
	`110`	`+ public any GetElemEx(int keySize) {`
	`111`	`+ return this.addr + keySize;`
`115`	`112`	`}`
`116`	`113`
`117`		`- public void SetElem(any value, NumberType elementSize = NumberType_Int32) {`
`118`		`- StoreToAddress(this.addr + NODET_OFFSET_ELEM, value, elementSize);`
	`114`	`+ public void SetElem(any value, int keySize, NumberType elementSize = NumberType_Int32) {`
	`115`	`+ StoreToAddress(this.addr + keySize, value, elementSize);`
`119`	`116`	`}`
`120`	`117`	`}`
`121`	`118`
`122`		`-#define UTL_MAP_OFFSET_TREE 0x0`
`123`		`-`
`124`	`119`	`methodmap UtlMap < AddressBase {`
`125`	`120`	`public UtlMap(Address addr) {`
`126`	`121`	`UtlMap p = view_as<UtlMap>(addr);`
`@@ -145,32 +140,32 @@ methodmap UtlMap < AddressBase {`
`145`	`140`	`#endif`
`146`	`141`	`}`
`147`	`142`
`148`		`- public any GetElement(int i, int size, NumberType elementSize = NumberType_Int32) {`
`149`		`- return view_as<Node_t>(this.m_Tree.Get(i, size)).GetElem(elementSize);`
	`143`	`+ public any GetElement(int i, int size, int keySize, NumberType elementSize = NumberType_Int32) {`
	`144`	`+ return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetElem(keySize, elementSize);`
`150`	`145`	`}`
`151`	`146`
`152`		`- public any GetElementEx(int i, int size) {`
`153`		`- return view_as<Node_t>(this.m_Tree.Get(i, size)).GetElemEx();`
	`147`	`+ public any GetElementEx(int i, int size, int keySize) {`
	`148`	`+ return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetElemEx(keySize);`
`154`	`149`	`}`
`155`	`150`
`156`		`- public void SetElement(int i, any value, int size, NumberType elementSize = NumberType_Int32) {`
`157`		`- view_as<Node_t>(this.m_Tree.Get(i, size)).SetElem(value, elementSize);`
	`151`	`+ public void SetElement(int i, any value, int size, int keySize, NumberType elementSize = NumberType_Int32) {`
	`152`	`+ view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).SetElem(value, keySize, elementSize);`
`158`	`153`	`}`
`159`	`154`
`160`	`155`	`public any GetKey(int i, int size, NumberType elementSize = NumberType_Int32) {`
`161`		`- return view_as<Node_t>(this.m_Tree.Get(i, size)).GetKey(elementSize);`
	`156`	`+ return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetKey(elementSize);`
`162`	`157`	`}`
`163`	`158`
`164`	`159`	`public any GetKeyEx(int i, int size) {`
`165`		`- return view_as<Node_t>(this.m_Tree.Get(i, size)).GetKeyEx();`
	`160`	`+ return view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).GetKeyEx();`
`166`	`161`	`}`
`167`	`162`
`168`	`163`	`public void SetKey(int i, any value, int size, NumberType elementSize = NumberType_Int32) {`
`169`		`- view_as<Node_t>(this.m_Tree.Get(i, size)).SetKey(value, elementSize);`
	`164`	`+ view_as<Node_t>(this.m_Tree.GetEx(i, size) + 8).SetKey(value, elementSize);`
`170`	`165`	`}`
`171`	`166`
`172`		`- public any Element(int i, int size, NumberType elementSize = NumberType_Int32) {`
`173`		`- return this.GetElement(i, size, elementSize);`
	`167`	`+ public any Element(int i, int size, int keySize, NumberType elementSize = NumberType_Int32) {`
	`168`	`+ return this.GetElement(i, size, keySize, elementSize);`
`174`	`169`	`}`
`175`	`170`
`176`	`171`	`public any Key(int i, int size, NumberType elementSize = NumberType_Int32) {`
`@@ -301,7 +296,7 @@ methodmap UtlMap < AddressBase {`
`301`	`296`	`return defaultValue;`
`302`	`297`	`}`
`303`	`298`
`304`		`- return this.GetElement(i, insertSize, numberType);`
	`299`	`+ return this.GetElement(i, insertSize, keySize, numberType);`
`305`	`300`	`}`
`306`	`301`
`307`	`302`	`public int FindClosest(any key, int keySize, int insertSize, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {`
`@@ -430,7 +425,7 @@ methodmap UtlMap < AddressBase {`
`430`	`425`	`return defaultValue;`
`431`	`426`	`}`
`432`	`427`
`433`		`- return this.GetElement(i, insertSize, numberType);`
	`428`	`+ return this.GetElement(i, insertSize, keySize, numberType);`
`434`	`429`	`}`
`435`	`430`
`436`	`431`	`public int FindClosest(any key, int keySize, int insertSize, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {`
`@@ -501,13 +496,13 @@ methodmap UtlMap < AddressBase {`
`501`	`496`	`return this.m_Tree.FindFirst(obj, size, numberType);`
`502`	`497`	`}`
`503`	`498`
`504`		`- public any FindElementSafe(any obj, int size, NumberType numberType = NumberType_Int32, any defaultValue = 0) {`
	`499`	`+ public any FindElementSafe(any obj, int size, int keySize, NumberType numberType = NumberType_Int32, any defaultValue = 0) {`
`505`	`500`	`int i = this.FindSafe(obj, size, numberType);`
`506`	`501`	`if (i == UtlRBTree.InvalidIndex()) {`
`507`	`502`	`return defaultValue;`
`508`	`503`	`}`
`509`	`504`
`510`		`- return this.GetElement(i, size, numberType);`
	`505`	`+ return this.GetElement(i, size, keySize, numberType);`
`511`	`506`	`}`
`512`	`507`
`513`	`508`	`public int FindClosestSafe(any obj, int size, NumberType numberType = NumberType_Int32, CompareOperands_t eFindCriteria) {`
`@@ -543,8 +538,8 @@ methodmap UtlMap < AddressBase {`
`543`	`538`	`continue;`
`544`	`539`
`545`	`540`	`if (bAlwaysFreeElems && destructor) {`
`546`		`- any elem = this.GetElement(i, keySize + elemSize, elementSize);`
`547`		`- any elemAddr = this.GetElementEx(i, keySize + elemSize);`
	`541`	`+ any elem = this.GetElement(i, keySize + elemSize, keySize, elementSize);`
	`542`	`+ any elemAddr = this.GetElementEx(i, keySize + elemSize, keySize);`
`548`	`543`
`549`	`544`	`this.Destruct(i, elemSize, elemAddr, elem, destructor);`
`550`	`545`	`}`