Fix players able to rejoin after spectating

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5114649ef06540e49cf25b613bf7e4b4f0d5afdd..c0df8e2fce6e890633b83408aef5b4c618aa8398 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -662,6 +662,9 @@ void PutClientInServer (void)
 
        if((g_arena && !self.spawned) || (g_ca && !allowed_to_spawn))
                self.classname = "observer";
+               
+       if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0)
+               self.classname = "observer";
 
        if(gameover)
                self.classname = "observer";

diff --git a/qcsrc/server/mutators/gamemode_lms.qc b/qcsrc/server/mutators/gamemode_lms.qc
index be84a517cac9ffdb05d556f894a9eec608521251..6266fbfc20b3818694957f18af660f792b7c5aaf 100644 (file)
--- a/qcsrc/server/mutators/gamemode_lms.qc
+++ b/qcsrc/server/mutators/gamemode_lms.qc
@@ -29,16 +29,6 @@ MUTATOR_HOOKFUNCTION(lms_RemovePlayer)
        return FALSE;
 }
 
-MUTATOR_HOOKFUNCTION(lms_PlayerSpawn)
-{
-       // player is dead and becomes observer
-       // FIXME fix LMS scoring for new system
-       if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0)
-               self.classname = "observer";
-       
-       return FALSE;
-}
-
 MUTATOR_HOOKFUNCTION(lms_ClientConnect)
 {
        self.classname = "player";
@@ -124,7 +114,7 @@ MUTATOR_HOOKFUNCTION(lms_BotSpawn)
        }
        
        return FALSE;
-}      
+}
 
 // scoreboard stuff
 void lms_ScoreRules()
@@ -146,7 +136,6 @@ void lms_Initialize()
 MUTATOR_DEFINITION(gamemode_lms)
 {
        MUTATOR_HOOK(MakePlayerObserver, lms_RemovePlayer, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerSpawn, lms_PlayerSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientConnect, lms_ClientConnect, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPreThink, lms_PlayerThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(ForbidThrowCurrentWeapon, lms_ForbidThrowing, CBC_ORDER_ANY);