From 5032644b7f0596bbbe7f333a3e7687054c9defb7 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 2 Jul 2023 22:23:20 +0200
Subject: [PATCH] Remove duplicate plugin interface version string literal

---
 r5dev/pluginsdk/pluginsdk.cpp      | 5 ++---
 r5dev/pluginsdk/pluginsdk.h        | 2 +-
 r5dev/pluginsystem/ipluginsystem.h | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/r5dev/pluginsdk/pluginsdk.cpp b/r5dev/pluginsdk/pluginsdk.cpp
index 9889e888..ac53ecd7 100644
--- a/r5dev/pluginsdk/pluginsdk.cpp
+++ b/r5dev/pluginsdk/pluginsdk.cpp
@@ -28,7 +28,6 @@ CPluginSDK::CPluginSDK(const char* pszSelfModule) : m_FactoryInstance(nullptr),
 //---------------------------------------------------------------------------------
 CPluginSDK::~CPluginSDK()
 {
-
 }
 
 //---------------------------------------------------------------------------------
@@ -54,12 +53,12 @@ bool CPluginSDK::InitSDK()
 		return false;
 
 	// Let's make sure the SDK version matches with the PluginSystem, else we unload
-	bool isPluginVersionOk = strcmp(m_FactoryInstance->GetFactoryFullName("VPluginSystem"), PLUGINSDK_CLASS_VERSION) == 0;
+	bool isPluginVersionOk = strcmp(m_FactoryInstance->GetFactoryFullName("VPluginSystem"), INTERFACEVERSION_PLUGINSYSTEM) == 0;
 	Assert(isPluginVersionOk, "Version mismatch between CPluginSDK and CPluginSystem.");
 	if (!isPluginVersionOk)
 		return false;
 
-	m_PluginSystem = m_FactoryInstance->GetFactoryPtr(PLUGINSDK_CLASS_VERSION, false).RCast<IPluginSystem*>();
+	m_PluginSystem = m_FactoryInstance->GetFactoryPtr(INTERFACEVERSION_PLUGINSYSTEM, false).RCast<IPluginSystem*>();
 	Assert(m_PluginSystem, "m_PluginSystem was nullptr.");
 	if (!m_PluginSystem)
 		return false;
diff --git a/r5dev/pluginsdk/pluginsdk.h b/r5dev/pluginsdk/pluginsdk.h
index de3025bd..fa6a0e22 100644
--- a/r5dev/pluginsdk/pluginsdk.h
+++ b/r5dev/pluginsdk/pluginsdk.h
@@ -21,5 +21,5 @@ private:
 	CModule m_GameModule;
 	CModule m_SDKModule;
 };
-constexpr const char* PLUGINSDK_CLASS_VERSION = "VPluginSystem001";
+
 extern CPluginSDK* g_pPluginSDK;
\ No newline at end of file
diff --git a/r5dev/pluginsystem/ipluginsystem.h b/r5dev/pluginsystem/ipluginsystem.h
index 1f68da72..21479ec4 100644
--- a/r5dev/pluginsystem/ipluginsystem.h
+++ b/r5dev/pluginsystem/ipluginsystem.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define INTERFACEVERSION_PLUGINSYSTEM "VPluginSystem001"
+
 struct PluginHelpWithAnything_t
 {
 	enum class ePluginHelp : int16_t
@@ -26,5 +28,3 @@ abstract_class IPluginSystem
 public:
 	virtual void* HelpWithAnything(PluginHelpWithAnything_t * help) = 0;
 };
-
-constexpr auto INTERFACEVERSION_PLUGINSYSTEM = "VPluginSystem001";
\ No newline at end of file