X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics.qc;h=6c0bd616bcfee30c402a41cc118f921946dfe62a;hb=8f935a3cd36d703f480691e5fe61ecaac0ebb5c0;hp=6153d80ae7f3efb2b750979c6758741b63d5194a;hpb=f878adf879c95c0c04ae8806e45aaa285917b39d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc
index 6153d80ae..6c0bd616b 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;
 
@@ -709,7 +709,7 @@ void CheckPlayerJump()
 		float activate = JETPACK_JUMP(self) && air_jump && PHYS_INPUT_BUTTON_JUMP(self) || PHYS_INPUT_BUTTON_JETPACK(self);
 		float has_fuel = !PHYS_JETPACK_FUEL || PHYS_AMMO_FUEL(self) || ITEMS_STAT(self) & IT_UNLIMITED_WEAPON_AMMO;
 
-		if (!(ITEMS_STAT(self) & IT_JETPACK)) { }
+		if (!(ITEMS_STAT(self) & ITEM_Jetpack.m_itemid)) { }
 		else if (self.jetpack_stopped) { }
 		else if (!has_fuel)
 		{
@@ -1193,7 +1193,7 @@ void PM_check_vortex(void)
 #ifdef SVQC
 	// WEAPONTODO
 	float xyspeed = vlen(vec2(self.velocity));
-	if (self.weapon == WEP_VORTEX && WEP_CVAR(vortex, charge) && WEP_CVAR(vortex, charge_velocity_rate) && xyspeed > WEP_CVAR(vortex, charge_minspeed))
+	if (self.weapon == WEP_VORTEX.m_id && WEP_CVAR(vortex, charge) && WEP_CVAR(vortex, charge_velocity_rate) && xyspeed > WEP_CVAR(vortex, charge_minspeed))
 	{
 		// add a maximum of charge_velocity_rate when going fast (f = 1), gradually increasing from minspeed (f = 0) to maxspeed
 	        xyspeed = min(xyspeed, WEP_CVAR(vortex, charge_maxspeed));