From 1da0a856a2c6ba9a576574bffe159ea23ed49e0e Mon Sep 17 00:00:00 2001 From: TimePath Date: Tue, 27 Oct 2015 19:25:31 +1100 Subject: [PATCH] Spectate: fix regression introduced by 74a4e5c --- qcsrc/server/cl_client.qc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index eb3dfc44e..d6522285b 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1780,10 +1780,9 @@ bool SpectateNext() {SELFPARAM(); other = find(self.enemy, classname, "player"); - bool mutator_returnvalue = MUTATOR_CALLHOOK(SpectateNext, self, other); - other = spec_player; - - if(!mutator_returnvalue && !other) + if (MUTATOR_CALLHOOK(SpectateNext, self, other)) + other = spec_player; + else if (!other) other = find(other, classname, "player"); if(other) { SetSpectatee(self, other); } @@ -1804,13 +1803,14 @@ bool SpectatePrev() while(other && other != self.enemy) other = other.chain; - int mutator_returnvalue = MUTATOR_CALLHOOK(SpectatePrev, self, other, first); - other = spec_player; - - switch(mutator_returnvalue) + switch (MUTATOR_CALLHOOK(SpectatePrev, self, other, first)) { - case MUT_SPECPREV_FOUND: break; - case MUT_SPECPREV_RETURN: return true; + case MUT_SPECPREV_FOUND: + other = spec_player; + break; + case MUT_SPECPREV_RETURN: + other = spec_player; + return true; case MUT_SPECPREV_CONTINUE: default: { -- 2.39.2