From: Mario <mario@smbclan.net>
Date: Wed, 21 Dec 2016 07:43:38 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~20
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d365412f17cdfe9f8cc49fbeb54f9a636352fab5;hp=d687a0bb2c31cbe483344f9191a6c8c06f83e3d7

Merge branch 'master' into Mario/wepent_experimental
---

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index a66d828cc9..1723584889 100644
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -815,5 +815,10 @@ void CSQC_ClientMovement_PlayerMove_Frame(entity this)
 
 #ifdef SVQC
 	this.pm_frametime = frametime;
+#elif defined(CSQC)
+	if((ITEMS_STAT(this) & IT_USING_JETPACK) && !IS_DEAD(this) && !intermission)
+		this.csqcmodel_modelflags |= MF_ROCKET;
+	else
+		this.csqcmodel_modelflags &= ~MF_ROCKET;
 #endif
 }