From 0f1798759915b303fa3de13769c0f7d05de6d316 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 2 Feb 2025 14:34:57 +0100
Subject: [PATCH] Common: improve SVC_SetClassVar member variable naming

This netmessage interfaces with the settings kay values system.
---
 src/common/netmessages.cpp | 16 ++++++++--------
 src/common/netmessages.h   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common/netmessages.cpp b/src/common/netmessages.cpp
index 1a8f72fe..fa77a4b3 100644
--- a/src/common/netmessages.cpp
+++ b/src/common/netmessages.cpp
@@ -70,24 +70,24 @@ bool SVC_UserMessage::ProcessImpl()
 ///////////////////////////////////////////////////////////////////////////////////
 bool SVC_SetClassVar::ReadFromBuffer(bf_read* buffer)
 {
-	const bool set = buffer->ReadString(m_szSetting, sizeof(m_szSetting));
-	const bool var = buffer->ReadString(m_szVariable, sizeof(m_szVariable));
+	const bool key = buffer->ReadString(m_szKey, sizeof(m_szKey));
+	const bool val = buffer->ReadString(m_szValue, sizeof(m_szValue));
 
-	return set && var;
+	return key && val;
 }
 bool SVC_SetClassVar::WriteToBuffer(bf_write* buffer)
 {
-	const bool set = buffer->WriteString(m_szSetting);
-	const bool var = buffer->WriteString(m_szVariable);
+	const bool key = buffer->WriteString(m_szKey);
+	const bool val = buffer->WriteString(m_szValue);
 
-	return set && var;
+	return key && val;
 }
 bool SVC_SetClassVar::Process(void)
 {
 	const char* pArgs[3] = {
 		"_setClassVarClient",
-		m_szSetting,
-		m_szVariable
+		m_szKey,
+		m_szValue
 	};
 
 	CCommand command((int)V_ARRAYSIZE(pArgs), pArgs, cmd_source_t::kCommandSrcCode);
diff --git a/src/common/netmessages.h b/src/common/netmessages.h
index 1bcbc270..1930c124 100644
--- a/src/common/netmessages.h
+++ b/src/common/netmessages.h
@@ -464,13 +464,13 @@ class SVC_SetClassVar : public CNetMessage
 {
 public:
 	SVC_SetClassVar() = default;
-	SVC_SetClassVar(const char* setting, const char* var)
+	SVC_SetClassVar(const char* key, const char* value)
 	{
-		V_strncpy(m_szSetting, setting, sizeof(m_szSetting));
-		V_strncpy(m_szVariable, var, sizeof(m_szVariable));
+		V_strncpy(m_szKey, key, sizeof(m_szKey));
+		V_strncpy(m_szValue, value, sizeof(m_szValue));
 
-		m_szSetting[sizeof(m_szSetting) - 1] = '\0';
-		m_szVariable[sizeof(m_szVariable) - 1] = '\0';
+		m_szKey[sizeof(m_szKey) - 1] = '\0';
+		m_szValue[sizeof(m_szValue) - 1] = '\0';
 
 		m_nGroup = 2; // must be set to 2 to avoid being copied into replay buffer
 	}
@@ -486,15 +486,15 @@ public:
 	virtual const char*		ToString(void) const
 	{
 		static char szBuf[4096];
-		V_snprintf(szBuf, sizeof(szBuf), "%s: setting \"%s\", variable \"%s\"", this->GetName(), m_szSetting, m_szVariable);
+		V_snprintf(szBuf, sizeof(szBuf), "%s: key \"%s\", value \"%s\"", this->GetName(), m_szKey, m_szValue);
 
 		return szBuf;
 	};
 
 	virtual size_t			GetSize(void) const { return sizeof(SVC_SetClassVar); }
 
-	char m_szSetting[128];
-	char m_szVariable[128];
+	char m_szKey[128];
+	char m_szValue[128];
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////