Merge branch 'master' into Mario/race_cts_mutators

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 493ddfeeef0015bc323873e0a2bea755961d9d5e..bb88fe431918be9f0e8913134ab4ced910a59d29 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -271,7 +271,7 @@ void FixPlayermodel()
                if(teamplay)
                {
                        string s;
-                       s = Team_ColorName_Lower(self.team);
+                       s = Static_Team_ColorName_Lower(self.team);
                        if(s != "neutral")
                        {
                                defaultmodel = cvar_string(strcat("sv_defaultplayermodel_", s));
@@ -1387,7 +1387,7 @@ void player_powerups (void)
        // add a way to see what the items were BEFORE all of these checks for the mutator hook
        olditems = self.items;
 
-       if((self.items & IT_USING_JETPACK) && !self.deadflag)
+       if((self.items & IT_USING_JETPACK) && !self.deadflag && !gameover)
                self.modelflags |= MF_ROCKET;
        else
                self.modelflags &= ~MF_ROCKET;