From 349bedd7f6951855e0f6f559624e7f5d077414d7 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 10 Sep 2010 00:38:03 +0300 Subject: [PATCH] Fix an old, major issue (yes, happened when I renamed Hook to Grabber :) ) --- data/qcsrc/client/Main.qc | 8 ++++---- data/qcsrc/client/View.qc | 6 +++--- data/qcsrc/client/main.qh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc index ae4ab68e..54f11ec1 100644 --- a/data/qcsrc/client/Main.qc +++ b/data/qcsrc/client/Main.qc @@ -118,7 +118,7 @@ void CSQC_Init(void) postinit = false; - calledgrabbers = 0; + calledhooks = 0; teams = Sort_Spawn(); players = Sort_Spawn(); @@ -207,9 +207,9 @@ void CSQC_Shutdown(void) if not(isdemo()) { - if not(calledgrabbers & GRABBER_START) + if not(calledhooks & HOOK_START) localcmd("\n_cl_hook_gamestart nop;"); - if not(calledgrabbers & GRABBER_END) + if not(calledhooks & HOOK_END) localcmd("\ncl_hook_gameend;"); } } @@ -947,7 +947,7 @@ void Gamemode_Init() if not(isdemo()) { localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), ";"); - calledgrabbers |= GRABBER_START; + calledhooks |= HOOK_START; } } // 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. diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index e9110fb0..ecbb3ddd 100644 --- 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) PostInit(); - if(intermission && !isdemo() && !(calledgrabbers & GRABBER_END)) - if(calledgrabbers & GRABBER_START) + if(intermission && !isdemo() && !(calledhooks & HOOK_END)) + if(calledhooks & HOOK_START) { localcmd("\ncl_hook_gameend;"); - calledgrabbers |= GRABBER_END; + calledhooks |= HOOK_END; } CheckForGamestartChange(); diff --git a/data/qcsrc/client/main.qh b/data/qcsrc/client/main.qh index 374746d1..949ff1bf 100644 --- a/data/qcsrc/client/main.qh +++ b/data/qcsrc/client/main.qh @@ -166,10 +166,10 @@ float g_weaponswitchdelay; float g_balance_vore_swallow_limit; -//grabbers -float calledgrabbers; -#define GRABBER_START 1 -#define GRABBER_END 2 +//hooks +float calledhooks; +#define HOOK_START 1 +#define HOOK_END 2 .float ping, ping_packetloss, ping_movementloss; .float plhealth, plpredator; -- 2.39.2