From 5aeac9f72a2bbdd4b4de8006a9ede50310ac8729 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 27 May 2022 02:24:34 +0200
Subject: [PATCH] rename 'g_szNetKey' to 'g_svNetKey'

sv = string variable
---
 r5dev/engine/net.cpp          | 20 ++++++++++----------
 r5dev/engine/net.h            |  2 +-
 r5dev/gameui/IBrowser.cpp     |  4 ++--
 r5dev/networksystem/pylon.cpp |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/r5dev/engine/net.cpp b/r5dev/engine/net.cpp
index 8cf1157f..4d1d434c 100644
--- a/r5dev/engine/net.cpp
+++ b/r5dev/engine/net.cpp
@@ -64,15 +64,15 @@ int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, v_netadr_t* pAdr, bo
 //-----------------------------------------------------------------------------
 void NET_SetKey(const string& svNetKey)
 {
-	g_szNetKey.clear();
-	g_szNetKey = svNetKey;
+	g_svNetKey.clear();
+	g_svNetKey = svNetKey;
 
 	DevMsg(eDLL_T::ENGINE, "______________________________________________________________\n");
 	DevMsg(eDLL_T::ENGINE, "] NET_KEY ----------------------------------------------------\n");
-	DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_szNetKey.c_str(), g_svReset.c_str());
+	DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_svNetKey.c_str(), g_svReset.c_str());
 	DevMsg(eDLL_T::ENGINE, "--------------------------------------------------------------\n");
 
-	v_NET_SetKey(g_pNetKey, g_szNetKey.c_str());
+	v_NET_SetKey(g_pNetKey, g_svNetKey.c_str());
 }
 
 //-----------------------------------------------------------------------------
@@ -80,7 +80,7 @@ void NET_SetKey(const string& svNetKey)
 //-----------------------------------------------------------------------------
 void NET_GenerateKey()
 {
-	g_szNetKey.clear();
+	g_svNetKey.clear();
 	net_useRandomKey->SetValue(1);
 
 	BCRYPT_ALG_HANDLE hAlgorithm;
@@ -98,17 +98,17 @@ void NET_GenerateKey()
 
 	for (int i = 0; i < 0x10u; i++)
 	{
-		g_szNetKey += pBuffer[i];
+		g_svNetKey += pBuffer[i];
 	}
 
-	g_szNetKey = Base64Encode(g_szNetKey);
+	g_svNetKey = Base64Encode(g_svNetKey);
 
 	DevMsg(eDLL_T::ENGINE, "______________________________________________________________\n");
 	DevMsg(eDLL_T::ENGINE, "] NET_KEY ----------------------------------------------------\n");
-	DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_szNetKey.c_str(), g_svReset.c_str());
+	DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_svNetKey.c_str(), g_svReset.c_str());
 	DevMsg(eDLL_T::ENGINE, "--------------------------------------------------------------\n");
 
-	v_NET_SetKey(g_pNetKey, g_szNetKey.c_str());
+	v_NET_SetKey(g_pNetKey, g_svNetKey.c_str());
 }
 
 //-----------------------------------------------------------------------------
@@ -246,6 +246,6 @@ void NET_Detach()
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-string g_szNetKey = "WDNWLmJYQ2ZlM0VoTid3Yg==";
+string g_svNetKey = "WDNWLmJYQ2ZlM0VoTid3Yg==";
 uintptr_t g_pNetKey = NULL;
 #endif // !NETCONSOLE
diff --git a/r5dev/engine/net.h b/r5dev/engine/net.h
index 2a0bdcba..90c62f87 100644
--- a/r5dev/engine/net.h
+++ b/r5dev/engine/net.h
@@ -38,7 +38,7 @@ void NET_Attach();
 void NET_Detach();
 
 ///////////////////////////////////////////////////////////////////////////////
-extern string g_szNetKey;
+extern string g_svNetKey;
 extern uintptr_t g_pNetKey;
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index dca9f625..d9fd878e 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -618,7 +618,7 @@ void IBrowser::SendHostingPostRequest(void)
             std::to_string(*g_nClientRemoteChecksum),
 
             std::string(),
-            g_szNetKey.c_str()
+            g_svNetKey.c_str()
         }
     );
 
@@ -668,7 +668,7 @@ void IBrowser::SettingsSection(void)
             g_pR5net = new R5Net::Client(r5net_matchmaking_hostname->GetString());
         }
     }
-    ImGui::InputText("Netkey", (char*)g_szNetKey.c_str(), ImGuiInputTextFlags_ReadOnly);
+    ImGui::InputText("Netkey", (char*)g_svNetKey.c_str(), ImGuiInputTextFlags_ReadOnly);
     if (ImGui::Button("Regenerate Encryption Key"))
     {
         RegenerateEncryptionKey();
diff --git a/r5dev/networksystem/pylon.cpp b/r5dev/networksystem/pylon.cpp
index 12ca644b..7e3e820a 100644
--- a/r5dev/networksystem/pylon.cpp
+++ b/r5dev/networksystem/pylon.cpp
@@ -36,7 +36,7 @@ void KeepAliveToPylon()
 				false,
 				std::to_string(*g_nServerRemoteChecksum),
 				std::string(),
-				g_szNetKey.c_str()
+				g_svNetKey.c_str()
 			}
 		);
 	}