Fix an old, major issue (yes, happened when I renamed Hook to Grabber :) )

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index ae4ab68ef5586db613f0a9a1b00fc99fa700b4ed..54f11ec1459a3698c6927372ae85292122e938a6 100644 (file)
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -118,7 +118,7 @@ void CSQC_Init(void)
 \r
        postinit = false;\r
 \r
-       calledgrabbers = 0;\r
+       calledhooks = 0;\r
 \r
        teams = Sort_Spawn();\r
        players = Sort_Spawn();\r
@@ -207,9 +207,9 @@ void CSQC_Shutdown(void)
 \r
        if not(isdemo())\r
        {\r
-               if not(calledgrabbers & GRABBER_START)\r
+               if not(calledhooks & HOOK_START)\r
                        localcmd("\n_cl_hook_gamestart nop;");\r
-               if not(calledgrabbers & GRABBER_END)\r
+               if not(calledhooks & HOOK_END)\r
                        localcmd("\ncl_hook_gameend;");\r
        }\r
 }\r
@@ -947,7 +947,7 @@ void Gamemode_Init()
        if not(isdemo())\r
        {\r
                localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), ";");\r
-               calledgrabbers |= GRABBER_START;\r
+               calledhooks |= HOOK_START;\r
        }\r
 }\r
 // CSQC_Parse_StuffCmd : Provides the stuffcmd string in the first parameter that the server provided.  To execute standard behavior, simply execute localcmd with the string.\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index e9110fb09e3c1dd32d2ed328e9e3c3f5cdc810e1..ecbb3ddda3eb54bbdddfd6783a66378a88449bb2 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -321,11 +321,11 @@ void CSQC_UpdateView(float w, float h)
        if(!postinit)\r
                PostInit();\r
 \r
-       if(intermission && !isdemo() && !(calledgrabbers & GRABBER_END))\r
-               if(calledgrabbers & GRABBER_START)\r
+       if(intermission && !isdemo() && !(calledhooks & HOOK_END))\r
+               if(calledhooks & HOOK_START)\r
                {\r
                        localcmd("\ncl_hook_gameend;");\r
-                       calledgrabbers |= GRABBER_END;\r
+                       calledhooks |= HOOK_END;\r
                }\r
 \r
        CheckForGamestartChange();\r

diff --git a/data/qcsrc/client/main.qh b/data/qcsrc/client/main.qh
index 374746d1a6fb0fe36ebed64b7e44177cd57f1a7d..949ff1bfedcf2e403ffff45d64c00b7ac091acc9 100644 (file)
--- a/data/qcsrc/client/main.qh
+++ b/data/qcsrc/client/main.qh
@@ -166,10 +166,10 @@ float g_weaponswitchdelay;
 \r
 float g_balance_vore_swallow_limit;\r
 \r
-//grabbers\r
-float calledgrabbers;\r
-#define GRABBER_START    1\r
-#define GRABBER_END      2\r
+//hooks\r
+float calledhooks;\r
+#define HOOK_START    1\r
+#define HOOK_END      2\r
 \r
 .float ping, ping_packetloss, ping_movementloss;\r
 .float plhealth, plpredator;\r