X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_porto.qc;h=f95e554b0e9799d78a52108ca39e72f2c7dde053;hb=bb7d458957c99f832ab7a3bc7103f6bc6414f0a9;hp=c919c497e661f7a098eb44199efa7cdfdb6c6c26;hpb=35a27cda61401d3d1af6782ee9c4661c7280f7ad;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index c919c497e..f95e554b0 100644
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -36,7 +36,7 @@ void W_Porto_Fail (float failhard)
 
 	self.realowner.porto_current = world;
 
-	if(self.cnt < 0 && !failhard && self.realowner.playerid == self.playerid && self.realowner.deadflag == DEAD_NO && !(self.realowner.weapons & WEPBIT_PORTO))
+	if(self.cnt < 0 && !failhard && self.realowner.playerid == self.playerid && self.realowner.deadflag == DEAD_NO && !WEPSET_CONTAINS_EW(self.realowner, WEP_PORTO))
 	{
 		setsize (self, '-16 -16 0', '16 16 32');
 		setorigin(self, self.origin + trace_plane_normal);
@@ -202,12 +202,6 @@ void W_Porto_Attack (float type)
 {
 	entity gren;
 
-	if(type == -1)
-	{
-		if not(self.items & IT_UNLIMITED_SUPERWEAPONS)
-			self.weapons = self.weapons - (self.weapons & WEPBIT_PORTO);
-	}
-
 	W_SetupShot (self, FALSE, 4, "porto/fire.wav", CH_WEAPON_A, 0);
 	// always shoot from the eye
 	w_shotdir = v_forward;
@@ -278,7 +272,7 @@ void spawnfunc_weapon_porto (void)
 float w_nexball_weapon(float req);
 float w_porto(float req)
 {
-	vector v_angle_save;
+	//vector v_angle_save;
 
 	if (g_nexball) { return w_nexball_weapon(req); }
 	if (req == WR_AIM)
@@ -332,7 +326,6 @@ float w_porto(float req)
 					ClientData_Touch(self);
 				}
 			}
-			v_angle_save = self.v_angle;
 			if(self.porto_v_angle_held)
 				makevectors(self.porto_v_angle); // override the previously set angles