Port version_nagtime to ClientState

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 128ef3dd6ddcc1d4532d8e9b82f34f5a4e9175ab..d891ac1d00f552fb50f0b70e96509c78fb7f4b81 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1125,8 +1125,8 @@ void ClientConnect(entity this)
 #ifdef WATERMARK
        Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_WATERMARK, WATERMARK);
 #endif
-       this.version_nagtime = time + 10 + random() * 10;
        TRANSMUTE(Client, this);
+       CS(this).version_nagtime = time + 10 + random() * 10;
 
        // identify the right forced team
        if (autocvar_g_campaign)
@@ -2485,8 +2485,8 @@ void PlayerPreThink (entity this)
        }
 
        // version nagging
-       if (this.version_nagtime && this.cvar_g_xonoticversion && time > this.version_nagtime) {
-        this.version_nagtime = 0;
+       if (CS(this).version_nagtime && this.cvar_g_xonoticversion && time > CS(this).version_nagtime) {
+        CS(this).version_nagtime = 0;
         if (strstrofs(this.cvar_g_xonoticversion, "git", 0) >= 0 || strstrofs(this.cvar_g_xonoticversion, "autobuild", 0) >= 0) {
             // git client
         } else if (strstrofs(autocvar_g_xonoticversion, "git", 0) >= 0 || strstrofs(autocvar_g_xonoticversion, "autobuild", 0) >= 0) {

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 03ff4775762f5db4d6f27ef34c0a3c0deba6f6bd..924346553ad74a00f8d354ea4035118feba5f061 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -83,6 +83,7 @@ CLASS(Client, Object)
     ATTRIB(Client, motd_actived_time, float, this.motd_actived_time);
     ATTRIB(Client, jointime, float, this.jointime);
     ATTRIB(Client, spectatortime, float, this.spectatortime);
+    ATTRIB(Client, version_nagtime, float, this.version_nagtime);
 
     METHOD(Client, m_unwind, bool(Client this));
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 6d1c7e31737d01b1d6fb0fb0cd53454cb888b5ea..9c14d9ccb6c28c3a23a31f3ab736d8dd08cf4689 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -179,8 +179,6 @@ float default_weapon_alpha;
 .float cvar_cl_allow_uidtracking;
 .string stored_netname;
 
-.float version_nagtime;
-
 string gamemode_name;
 
 float startitem_failed;