Merge branch 'Mario/matchcount' into 'develop'

Merge branch Mario/matchcount (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!606

diff --git a/gamemodes-client.cfg b/gamemodes-client.cfg
index c43b9d1d3f2e6fe73fddbb33e8489670350edc4d..71d272a174e7c50dcb868fa34e472d043668a250 100644 (file)
--- a/gamemodes-client.cfg
+++ b/gamemodes-client.cfg
@@ -32,6 +32,6 @@ alias cl_hook_gamestart_ka
 alias cl_hook_gamestart_ft
 alias cl_hook_gamestart_inv
 alias cl_hook_gamestart_duel
-alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+alias cl_hook_gameend
 alias cl_hook_shutdown
 alias cl_hook_activeweapon

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 16600f7433eb17b1af72c33ded08c7db7183d9ec..944bb2f33ccaf6d2f83ef1c4a50ad6b881bc7dbf 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -174,7 +174,14 @@ void Shutdown()
                if (!(calledhooks & HOOK_START))
                        localcmd("\n_cl_hook_gamestart nop\n");
                if (!(calledhooks & HOOK_END))
+               {
+                       int gamecount = cvar("cl_matchcount");
                        localcmd("\ncl_hook_gameend\n");
+                       // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+                       // earlier versions of the game abuse the hook to set this cvar
+                       localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+                       //cvar_set("cl_matchcount", itos(gamecount + 1));
+               }
        }
 
        localcmd("\ncl_hook_shutdown\n");

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index e03dca633c28b54a030d1f65939437858daa0332..0593fdfb2d4bc86c03ef7db34e60ee1ac40a0ec8 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1694,7 +1694,12 @@ void CSQC_UpdateView(entity this, float w, float h)
        {
                if(calledhooks & HOOK_START)
                {
+                       int gamecount = cvar("cl_matchcount");
                        localcmd("\ncl_hook_gameend\n");
+                       // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+                       // earlier versions of the game abuse the hook to set this cvar
+                       localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+                       //cvar_set("cl_matchcount", itos(gamecount + 1));
                        calledhooks |= HOOK_END;
                }
        }