Merge pull request #242 from cleolibrary/CText_Get_update

Address translation for CText::Get

Author: gennariarmando

plugin_sa/game_sa/CText.cpp

@@ -6,11 +6,12 @@
 */
 #include "CText.h"
 
+PLUGIN_SOURCE_FILE
+
 #define VAR_TheText 0xC1B340;
 
 #define FUNC_CText__Constructor 0x6A00F0
 #define FUNC_CText__Destructor 0x6A0140
-#define FUNC_CText__Get 0x6A0050
 #define FUNC_CText__Load 0x6A01A0
 #define FUNC_CText__LoadMissionTable 0x69FBF0
 #define FUNC_CText__LoadMpack 0x69F9A0
@@ -93,10 +94,12 @@ CText::~CText()
 	((void (__thiscall*)(CText*)) FUNC_CText__Destructor )(this);
 }
 
+int addrof(CText::Get) = ADDRESS_BY_VERSION(0x6A0050, 0, 0x6A0050, 0x6A0870, 0x6CCCE0, 0);
+int gaddrof(CText::Get) = GLOBAL_ADDRESS_BY_VERSION(0x6A0050, 0, 0x6A0050, 0x6A0870, 0x6CCCE0, 0);
+
 // Returns text pointer by GXT key
-char *__thiscall CText::Get(const char *key)
-{
-	return ( (char *(__thiscall*)(CText*, const char *key)) FUNC_CText__Get )(this, key);
+const char* CText::Get(const char* key) {
+	return plugin::CallMethodAndReturnDynGlobal<const char*, CText*, const char*>(gaddrof(CText::Get), this, key);
 }
 
 // Reads MPACK tag

plugin_sa/game_sa/CText.h

@@ -100,7 +100,7 @@ class PLUGIN_API CText
 	~CText();
 
 	// Returns text pointer by GXT key
-	char *__thiscall Get(const char *key);
+	SUPPORTED_10US_10EU_11EU_SR2 const char* Get(const char* key);
 
 	// Reads MPACK tag
 	static void __stdcall readTag(char *buf, FILE *file, int *pFileOffset, bool dontRead);
@@ -122,4 +122,6 @@ class PLUGIN_API CText
 };
 VALIDATE_SIZE(CText, 0xA90);
 
-extern PLUGIN_API CText& TheText;
+extern PLUGIN_API CText& TheText;
+
+#include "meta/meta.CText.h"

plugin_sa/game_sa/meta/meta.CText.h

@@ -0,0 +1,25 @@
+/*
+    Plugin-SDK (Grand Theft Auto San Andreas) header file
+    Authors: GTA Community. See more here
+    https://github.com/DK22Pac/plugin-sdk
+    Do not delete this comment block. Respect others' work!
+*/
+#include "PluginBase.h"
+
+namespace plugin {
+
+META_BEGIN(CText::Get)
+    static int address;
+    static int global_address;
+    static const int id = 0x6A0050;
+    static const bool is_virtual = false;
+    static const int vtable_index = -1;
+    using mv_addresses_t = MvAddresses<0x6A0050, 0, 0x6A0050, 0x6A0870, 0x6CCCE0, 0>;
+    using refs_t = RefList<>;
+    using def_t = const char* (CText*, const char*);
+    static const int cb_priority = PRIORITY_BEFORE; 
+    using calling_convention_t = CallingConventions::Thiscall;
+    using args_t = ArgPick<ArgTypes<CText*, const char*>, 0, 1>;
+META_END
+
+}