From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 10 Jun 2012 17:14:12 +0000 (+0200)
Subject: forcemodels: don't force server's idea if isdemo()
X-Git-Tag: xonotic-v0.7.0~312^2~28^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e381699da4a4cac5cbf0a34f1530d40d87804e57;p=xonotic%2Fxonotic-data.pk3dir.git

forcemodels: don't force server's idea if isdemo()
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 152ecbe82..009e7e7e4 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -133,12 +133,15 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer)
 	{
 		if(islocalplayer)
 		{
-			// trust server's idea of "own player model"
-			forceplayermodels_modelisgoodmodel = self.forceplayermodels_isgoodmodel;
-			forceplayermodels_model = self.forceplayermodels_savemodel;
-			forceplayermodels_modelindex = self.forceplayermodels_savemodelindex;
-			forceplayermodels_skin = self.forceplayermodels_saveskin;
-			forceplayermodels_attempted = 1;
+			if(!isdemo()) // this is mainly cheat protection; not needed for demos
+			{
+				// trust server's idea of "own player model"
+				forceplayermodels_modelisgoodmodel = self.forceplayermodels_isgoodmodel;
+				forceplayermodels_model = self.forceplayermodels_savemodel;
+				forceplayermodels_modelindex = self.forceplayermodels_savemodelindex;
+				forceplayermodels_skin = self.forceplayermodels_saveskin;
+				forceplayermodels_attempted = 1;
+			}
 		}
 	}