Read size of static_attrib_t from gamedata

Totally not useless futureproofing.
nosoop · Feb 5, 2020 · 74f50c0 · 74f50c0
1 parent 19acb66
commit 74f50c0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/gamedata/tf2.econ_data.txt b/gamedata/tf2.econ_data.txt
@@ -308,6 +308,13 @@
 				"linux"		"268"
 				"windows"	"268"
 			}
+
+			"sizeof(static_attrib_t)"
+			{
+				// used for iterating over the attribute list
+				"linux"		"8"
+				"windows"	"8"
+			}
 		}
 	}
 }
diff --git a/scripting/tf_econ_data.sp b/scripting/tf_econ_data.sp
@@ -13,7 +13,7 @@
 #include <stocksoup/handles>
 #include <stocksoup/memory>
 
-#define PLUGIN_VERSION "0.16.5"
+#define PLUGIN_VERSION "0.16.6"
 public Plugin myinfo = {
 	name = "[TF2] Econ Data",
 	author = "nosoop",
@@ -275,6 +275,8 @@ public void OnPluginStart() {
 			GameConfGetAddressOffset(hGameConf,
 			"CProtoBufScriptObjectDefinitionManager::m_PaintList");
 
+	sizeof_static_attrib_t = GameConfGetAddressOffset(hGameConf, "sizeof(static_attrib_t)");
+
 	delete hGameConf;
 
 	CreateConVar("tfecondata_version", PLUGIN_VERSION,

diff --git a/scripting/tf_econ_data/item_definition.sp b/scripting/tf_econ_data/item_definition.sp
@@ -15,6 +15,8 @@ Address offs_CEconItemDefinition_pKeyValues,
 		offs_CEconItemDefinition_bitsEquipRegionConflicts;
 Address offs_CEconItemDefinition_aiItemSlot;
 
+Address sizeof_static_attrib_t;
+
 // in CEconItemDefinition, defindex is at 0x08 (we never use this information though)
 
 /**
@@ -212,11 +214,11 @@ public int Native_GetItemStaticAttributes(Handle hPlugin, int nParams) {
 			NumberType_Int32);
 	Address pAttribList = DereferencePointer(pItemDef + offs_CEconItemDefinition_AttributeList);
 
-	// struct { attribute_defindex, value }
+	// struct { attribute_defindex, value } // (TF2)
 	ArrayList attributeList = new ArrayList(2, nAttribs);
 	for (int i; i < nAttribs; i++) {
-		// TODO push attributes to list
-		Address pStaticAttrib = pAttribList + view_as<Address>(i * 0x08);
+		Address pStaticAttrib = pAttribList
+				+ view_as<Address>(i * view_as<int>(sizeof_static_attrib_t));
 
 		int attrIndex = LoadFromAddress(pStaticAttrib, NumberType_Int16);
 		any attrValue = LoadFromAddress(pStaticAttrib + view_as<Address>(0x04),