simplify forcemodels code a bit

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 3c736830115d78f4a82ac0177af7c7db012192b6..320ae656b89dc117133f025ee9a41b33151002bb 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -165,7 +165,7 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
        }
 
        // apply it
-       if(autocvar_cl_forcemyplayermodel != "" && forceplayermodels_myisgoodmodel && self.entnum == player_localnum + 1)
+       if(autocvar_cl_forcemyplayermodel != "" && forceplayermodels_myisgoodmodel && islocalplayer)
        {
                self.model = forceplayermodels_mymodel;
                self.modelindex = forceplayermodels_mymodelindex;
@@ -193,7 +193,7 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
        // forceplayercolors too
        if(!teamplay)
        {
-               if(autocvar_cl_forcemyplayercolors && self.entnum == player_localnum + 1)
+               if(autocvar_cl_forcemyplayercolors && islocalplayer)
                        self.colormap = 1024 + autocvar_cl_forcemyplayercolors;
                else if(autocvar_cl_forceplayercolors)
                        self.colormap = player_localnum + 1;
@@ -468,8 +468,8 @@ void CSQCModel_Hook_PreDraw()
 
        if(self.isplayermodel) // this checks if it's a player MODEL!
        {
-               CSQCPlayer_GlowMod_Apply();
                CSQCPlayer_ForceModel_Apply(self.entnum == player_localnum + 1);
+               CSQCPlayer_GlowMod_Apply();
                CSQCPlayer_LOD_Apply();
                CSQCPlayer_FallbackFrame_Apply();
        }