X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=c29523bfce730fee240f67ef86c8938a0d6632ca;hp=0e0a271276c43afbfab43a0c102de4468f0c081e;hb=3adaa0873ad9eac20f32e6e3fc0455d4f9e044cd;hpb=34863a007ec889fda4c131fe4ed5e959c4832763 diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 0e0a271276..c29523bfce 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -283,7 +283,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)); @@ -1414,7 +1414,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;