From 94f1f697716d2e03f6428340b98c94da9ab27dc4 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 6 Mar 2013 00:40:42 +0100 Subject: [PATCH] CA: Don't try to join the game with jump button if observer is already scheduled to join the next round --- qcsrc/server/cl_client.qc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index c0ca7e8a0..6cc315098 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2257,6 +2257,8 @@ void ShowRespawnCountdown() .float prevent_join_msgtime; void LeaveSpectatorMode() { + if(self.caplayer) + return; if(nJoinAllowed(self)) { if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || (self.wasplayer && autocvar_g_changeteam_banned) || self.team_forced > 0) { self.classname = "player"; @@ -2281,12 +2283,8 @@ void LeaveSpectatorMode() Send_CSQC_Centerprint_Generic_Expire(self, CPID_PREVENT_JOIN); self.prevent_join_msgtime = 0; } - - return; } else { - if(!self.caplayer) - stuffcmd(self,"menu_showteamselect\n"); - return; + stuffcmd(self, "menu_showteamselect\n"); } } else { -- 2.39.2