Clan Arena: fix team selection dialog displayed once more after a player dies for...

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 97c4cce5a6b7b4e6e50f98721944f9604bcf979f..06aac36e774b659e4983a1f9578112bcd6ed03fe 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2151,8 +2151,8 @@ bool joinAllowed(entity this)
        if (CS(this).version_mismatch) return false;
        if (!nJoinAllowed(this, this)) return false;
        if (teamplay && lockteams) return false;
-       if (ShowTeamSelection(this)) return false;
        if (MUTATOR_CALLHOOK(ForbidSpawn, this)) return false;
+       if (ShowTeamSelection(this)) return false;
        return true;
 }
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/server/mutators/mutator/gamemode_ca.qc
index 49bd58bd8c3852266b4d77e2e7eca73ff3362189..176661ac9888944de75a17cb9bd8916a9b5f5224 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ca.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ca.qc
@@ -268,7 +268,7 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDies)
        if (!allowed_to_spawn)
        {
                frag_target.respawn_flags = RESPAWN_SILENT;
-               // prevent unwanted sudden rejoin as spectator and move of spectator camera
+               // prevent unwanted sudden rejoin as spectator and movement of spectator camera
                frag_target.respawn_time = time + 2;
        }
        frag_target.respawn_flags |= RESPAWN_FORCE;