From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 6 Sep 2010 17:25:06 +0000 (+0300)
Subject: Never allow using the jetpack in someone's belly (and fix some text alignment)
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=c53a92770b297c1fe65caa9ffdc4e3b67c815653

Never allow using the jetpack in someone's belly (and fix some text alignment)
---

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 7c5c9b14..3b6ca108 100644
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -902,7 +902,7 @@ void SV_PlayerPhysics()
 			PM_Accelerate(wishdir, wishspeed, wishspeed, sv_accelerate*maxspd_mod, 1, 0);
 		}
 	}
-	else if ((self.items & IT_JETPACK) && self.BUTTON_JETPACK && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO))
+	else if ((self.items & IT_JETPACK) && self.BUTTON_JETPACK && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && self.eater.classname != "player")
 	{
 		//makevectors(self.v_angle_y * '0 1 0');
 		makevectors(self.v_angle);
@@ -1004,7 +1004,7 @@ void SV_PlayerPhysics()
 	else if (self.flags & FL_ONGROUND)
 	{
 		// we get here if we ran out of ammo
-		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32))
+		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.eater.classname != "player")
 			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
 
 		// walking
@@ -1065,7 +1065,7 @@ void SV_PlayerPhysics()
 	{
 		float wishspeed0;
 		// we get here if we ran out of ammo
-		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32))
+		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.eater.classname != "player")
 			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
 
 		if(maxspd_mod < 1)
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index c3b0e830..569236ed 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -7,7 +7,7 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spa
 #define BUTTON_ATCK2       button3
 #define BUTTON_ZOOM        button4
 #define BUTTON_CROUCH      button5
-#define BUTTON_JETPACK        button6
+#define BUTTON_JETPACK     button6
 #define BUTTON_INFO        button7
 #define BUTTON_CHAT        buttonchat
 #define BUTTON_USE         buttonuse