Explorar el Código

Use gameconf interface instead of memutils

nosoop hace 1 año
padre
commit
405e88b1a9
Se han modificado 4 ficheros con 39 adiciones y 26 borrados
  1. 5 0
      PackageScript
  2. 10 24
      econmanager.cpp
  3. 22 0
      gamedata/tf2.econ_dynamic.txt
  4. 2 2
      smsdk_config.h

+ 5 - 0
PackageScript

@@ -12,6 +12,7 @@ folder_list = [
   mms_plugin_directory + '/bin',
   
   'addons/metamod', ## !CHANGEME! if you want to add the VDF loader
+  'addons/sourcemod/gamedata',
 ]
 
 # Create the distribution folder hierarchy.
@@ -33,6 +34,10 @@ CopyFiles('', 'addons/metamod', [
   'tf2dynschema.vdf', ## !CHANGEME! if you want to add the VDF loader
 ])
 
+CopyFiles('gamedata', 'addons/sourcemod/gamedata', [
+  'tf2.econ_dynamic.txt',
+])
+
 # Copy binaries.
 for cxx_task in MMS.binaries:
   builder.AddCopy(cxx_task.binary, folder_map[mms_plugin_directory + '/bin'])

+ 10 - 24
econmanager.cpp

@@ -1,5 +1,7 @@
 #include "econmanager.h"
 
+#include <IGameConfigs.h>
+
 #include <map>
 
 CEconManager g_EconManager;
@@ -24,38 +26,22 @@ CEconItemAttributeInitFromKV_fn fnItemAttributeInitFromKV = nullptr;
 
 bool CEconManager::Init(char *error, size_t maxlength) {
 	// get the base address of the server
-	{
-#if _WINDOWS
-	fnGetEconItemSchema = reinterpret_cast<GetEconItemSchema_fn>(sm_memutils->FindPattern(server, "\xE8\x2A\x2A\x2A\x2A\x83\xC0\x04\xC3", 9));
-	fnItemAttributeInitFromKV = reinterpret_cast<CEconItemAttributeInitFromKV_fn>(sm_memutils->FindPattern(server, "\x55\x8B\xEC\x53\x8B\x5D\x08\x56\x8B\xF1\x8B\xCB\x57\xE8\x2A\x2A\x2A\x2A", 18));
-#elif _LINUX
-		Dl_info info;
-		if (dladdr(server, &info) == 0) {
-			snprintf(error, maxlength, "dladdr failed");
-			return 0;
-		}
-		void *handle = dlopen(info.dli_fname, RTLD_NOW);
-		if (!handle) {
-			snprintf(error, maxlength, "Failed to dlopen server.");
-			return 0;
-		}
-		
-		fnGetEconItemSchema = reinterpret_cast<GetEconItemSchema_fn>(sm_memutils->ResolveSymbol(handle, "_Z15GEconItemSchemav"));
-		
-		fnItemAttributeInitFromKV = reinterpret_cast<CEconItemAttributeInitFromKV_fn>(sm_memutils->ResolveSymbol(handle, "_ZN28CEconItemAttributeDefinition11BInitFromKVEP9KeyValuesP10CUtlVectorI10CUtlString10CUtlMemoryIS3_iEE"));
-		
-		dlclose(handle);
-#endif
+	
+	SourceMod::IGameConfig *conf;
+	if (!sm_gameconfs->LoadGameConfigFile("tf2.econ_dynamic", &conf, error, maxlength)) {
+		return false;
 	}
 	
-	if (fnGetEconItemSchema == nullptr) {
+	if (!conf->GetMemSig("GEconItemSchema()", (void**) &fnGetEconItemSchema)) {
 		snprintf(error, maxlength, "Failed to setup call to GetEconItemSchema()");
 		return false;
-	} else if (fnItemAttributeInitFromKV == nullptr) {
+	} else if (!conf->GetMemSig("CEconItemAttributeDefinition::BInitFromKV()", (void**) &fnItemAttributeInitFromKV)) {
 		snprintf(error, maxlength, "Failed to setup call to CEconItemAttributeDefinition::BInitFromKV");
 		return false;
 	}
 	
+	sm_gameconfs->CloseGameConfigFile(conf);
+	
 	// is this late enough in the MM:S load stage?  we might just have to hold the function
 	g_SchemaAttributes = reinterpret_cast<AttributeMap*>(fnGetEconItemSchema() + 0x1BC);
 	return true;

+ 22 - 0
gamedata/tf2.econ_dynamic.txt

@@ -0,0 +1,22 @@
+"Games"
+{
+	"tf"
+	{
+		"Signatures"
+		{
+			"GEconItemSchema()"
+			{
+				// taken straight from tf2attributes
+				"library"	"server"
+				"linux"		"@_Z15GEconItemSchemav"
+				"windows"	"\xE8\x2A\x2A\x2A\x2A\x83\xC0\x04\xC3"
+			}
+			"CEconItemAttributeDefinition::BInitFromKV()"
+			{
+				"library"	"server"
+				"linux"		"@_ZN28CEconItemAttributeDefinition11BInitFromKVEP9KeyValuesP10CUtlVectorI10CUtlString10CUtlMemoryIS3_iEE"
+				"windows"	"\x55\x8B\xEC\x53\x8B\x5D\x08\x56\x8B\xF1\x8B\xCB\x57\xE8\x2A\x2A\x2A\x2A"
+			}
+		}
+	}
+}

+ 2 - 2
smsdk_config.h

@@ -59,8 +59,8 @@ void SM_UnsetInterfaces();
 //#define SMEXT_ENABLE_HANDLESYS
 //#define SMEXT_ENABLE_PLAYERHELPERS
 //#define SMEXT_ENABLE_DBMANAGER
-//#define SMEXT_ENABLE_GAMECONF
-#define SMEXT_ENABLE_MEMUTILS
+#define SMEXT_ENABLE_GAMECONF
+//#define SMEXT_ENABLE_MEMUTILS
 //#define SMEXT_ENABLE_GAMEHELPERS
 //#define SMEXT_ENABLE_TIMERSYS
 //#define SMEXT_ENABLE_THREADER