Merge remote branch 'origin/terencehill/powerups_respawntime_fix'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / csqcmodel_hooks.qc

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 60a56ad5a4839fdfa994bb4d40d760e5b1c0625a..6010cf0a521e1421a8bfdaecb11bafe230652c21 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -117,6 +117,7 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
        {
                entity e;
                e = spawn();
+               precache_model(cvar_defstring("_cl_playermodel"));
                setmodel(e, cvar_defstring("_cl_playermodel"));
                forceplayermodels_goodmodel = e.model;
                forceplayermodels_goodmodelindex = e.modelindex;
@@ -463,8 +464,9 @@ void CSQCPlayer_GlowMod_Apply(void)
                {
                        self.glowmod = self.glowmod * bound(0, 1 - (time - self.death_time) / autocvar_cl_deathglow, 1);
                        // prevent the zero vector
-                       if(self.glowmod_x == 0)
-                               self.glowmod_x = -1;
+                       self.glowmod_x = max(self.glowmod_x, 0.0001);
+                       self.glowmod_y = max(self.glowmod_y, 0.0001);
+                       self.glowmod_z = max(self.glowmod_z, 0.0001);
                }
 }