From 84fa5f5ff8d965b8c770061017c8f90cb455595e Mon Sep 17 00:00:00 2001
From: Mario <mario@smbclan.net>
Date: Sun, 16 Jul 2017 18:29:55 +1000
Subject: [PATCH] Port version to ClientState

---
 qcsrc/server/client.qh      | 1 +
 qcsrc/server/command/cmd.qc | 4 ++--
 qcsrc/server/defs.qh        | 2 --
 qcsrc/server/teamplay.qc    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 304513132..be6cc0d60 100644
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -90,6 +90,7 @@ CLASS(Client, Object)
     ATTRIB(Client, taunt_soundtime, float, this.taunt_soundtime);
     ATTRIB(Client, killcount, int, this.killcount);
     ATTRIB(Client, version_mismatch, bool, this.version_mismatch);
+    ATTRIB(Client, version, int, this.version);
 
     METHOD(Client, m_unwind, bool(Client this));
 
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index ef1116317..6d7ee81af 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -101,9 +101,9 @@ void ClientCommand_clientversion(entity caller, float request, float argc)  // i
 			{
 				if (IS_CLIENT(caller))
 				{
-					caller.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
+					CS(caller).version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
 
-					if (caller.version < autocvar_gameversion_min || caller.version > autocvar_gameversion_max)
+					if (CS(caller).version < autocvar_gameversion_min || CS(caller).version > autocvar_gameversion_max)
 					{
 						CS(caller).version_mismatch = true;
 						ClientKill_TeamChange(caller, -2);  // observe
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 07bec4b6c..1c65847f4 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -131,8 +131,6 @@ float intermission_running;
 float intermission_exittime;
 float alreadychangedlevel;
 
-.float version;
-
 // footstep interval
 .float nextstep;
 
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 51ad5edb9..1cc9db2b9 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -88,7 +88,7 @@ void InitGameplayMode()
 string GetClientVersionMessage(entity this)
 {
 	if (CS(this).version_mismatch) {
-		if(this.version < autocvar_gameversion) {
+		if(CS(this).version < autocvar_gameversion) {
 			return strcat("This is Xonotic ", autocvar_g_xonoticversion,
 				"\n^3Your client version is outdated.\n\n\n### YOU WON'T BE ABLE TO PLAY ON THIS SERVER ###\n\n\nPlease update!!!^8");
 		} else {
-- 
2.39.2