X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qc;h=0cac08bb0c0fab1c7ac93ccdb160863753907c56;hb=c14f2b067c9ab0b4fb8a5b7805c8679be61f1fe0;hp=4143ad3b11a71e651fba7b32e129f132692ea702;hpb=a16bfaa11ae87fe6fdab9e6c4504e2c5528ea595;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index 4143ad3b1..0cac08bb0 100644
--- a/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@ -553,12 +553,12 @@ bool PlayerJump (void)
 	bool doublejump = false;
 	float mjumpheight = PHYS_JUMPVELOCITY;
 
-	player_multijump = doublejump;
-	player_jumpheight = mjumpheight;
 #ifdef SVQC
-	if (MUTATOR_CALLHOOK(PlayerJump))
+	if (MUTATOR_CALLHOOK(PlayerJump, doublejump, mjumpheight))
 #elif defined(CSQC)
-	if(PM_multijump_checkjump())
+	player_multijump = doublejump;
+	player_jumpheight = mjumpheight;
+	if (PM_multijump_checkjump())
 #endif
 		return true;
 
@@ -1885,7 +1885,7 @@ void PM_Main()
 		RaceCarPhysics();
 #endif
 
-	else if (self.movetype == MOVETYPE_NOCLIP || self.movetype == MOVETYPE_FLY || self.movetype == MOVETYPE_FLY_WORLDONLY || (BUFFS(self) & BUFF_FLIGHT))
+	else if (self.movetype == MOVETYPE_NOCLIP || self.movetype == MOVETYPE_FLY || self.movetype == MOVETYPE_FLY_WORLDONLY || (BUFFS_STAT(self) & BUFF_FLIGHT.m_itemid))
 		PM_fly(maxspeed_mod);
 
 	else if (self.waterlevel >= WATERLEVEL_SWIMMING)