Merge branch 'master' into Mario/wepent_experimental

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / player.qc

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index a66d828cc989c308b5b3f7f2d953e915b7116120..1723584889fb1ce5619ec097a35b9e6ecbf68397 100644 (file)
--- 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
 }