X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_porto.qc;h=1eb0f4b0bc80d528b2572f2bfc97a76c18271e3d;hp=fad480d012ec58623f4f07e8a19b22a3d0b9e518;hb=ceddf084c0eacb2eb030550449f4fbdfa8e3f642;hpb=65f71b6a7b489c6f5a2275928da75a672327a981

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index fad480d01..1eb0f4b0b 100644
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -46,7 +46,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 && !WEPSET_CONTAINS_EW(self.realowner, WEP_PORTO))
+	if(self.cnt < 0 && !failhard && self.realowner.playerid == self.playerid && self.realowner.deadflag == DEAD_NO && !(self.realowner.weapons & WEPSET_PORTO))
 	{
 		setsize (self, '-16 -16 0', '16 16 32');
 		setorigin(self, self.origin + trace_plane_normal);
@@ -110,19 +110,19 @@ void W_Porto_Touch (void)
 
 	if(self.realowner.playerid != self.playerid)
 	{
-		sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+		sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 		remove(self);
 	}
 	else if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SLICK || trace_dphitcontents & DPCONTENTS_PLAYERCLIP)
 	{
-		spamsound(self, CH_SHOTS, "porto/bounce.wav", VOL_BASE, ATTN_NORM);
+		spamsound(self, CH_SHOTS, "porto/bounce.wav", VOL_BASE, ATTEN_NORM);
 		// just reflect
 		self.right_vector = self.right_vector - 2 * trace_plane_normal * (self.right_vector * trace_plane_normal);
 		self.angles = vectoangles(self.velocity - 2 * trace_plane_normal * (self.velocity * trace_plane_normal));
 	}
 	else if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
 	{
-		sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+		sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 		W_Porto_Fail(0);
 		if(self.cnt < 0)
 			Portal_ClearAll_PortalsOnly(self.realowner);
@@ -132,14 +132,14 @@ void W_Porto_Touch (void)
 		// in-portal only
 		if(Portal_SpawnInPortalAtTrace(self.realowner, self.right_vector, self.portal_id))
 		{
-			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			centerprint(self.realowner, "^1In^7-portal created.");
 			W_Porto_Success();
 		}
 		else
 		{
-			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			W_Porto_Fail(0);
 		}
@@ -149,14 +149,14 @@ void W_Porto_Touch (void)
 		// out-portal only
 		if(Portal_SpawnOutPortalAtTrace(self.realowner, self.right_vector, self.portal_id))
 		{
-			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			centerprint(self.realowner, "^4Out^7-portal created.");
 			W_Porto_Success();
 		}
 		else
 		{
-			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			W_Porto_Fail(0);
 		}
@@ -166,7 +166,7 @@ void W_Porto_Touch (void)
 		self.effects += EF_BLUE - EF_RED;
 		if(Portal_SpawnInPortalAtTrace(self.realowner, self.right_vector, self.portal_id))
 		{
-			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			centerprint(self.realowner, "^1In^7-portal created.");
 			self.right_vector = self.right_vector - 2 * trace_plane_normal * (self.right_vector * norm);
@@ -175,7 +175,7 @@ void W_Porto_Touch (void)
 		}
 		else
 		{
-			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 			trace_plane_normal = norm;
 			Portal_ClearAll_PortalsOnly(self.realowner);
 			W_Porto_Fail(0);
@@ -187,21 +187,21 @@ void W_Porto_Touch (void)
 		{
 			if(Portal_SpawnOutPortalAtTrace(self.realowner, self.right_vector, self.portal_id))
 			{
-				sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTN_NORM);
+				sound(self, CH_SHOTS, "porto/create.wav", VOL_BASE, ATTEN_NORM);
 				trace_plane_normal = norm;
 				centerprint(self.realowner, "^4Out^7-portal created.");
 				W_Porto_Success();
 			}
 			else
 			{
-				sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+				sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 				Portal_ClearAll_PortalsOnly(self.realowner);
 				W_Porto_Fail(0);
 			}
 		}
 		else
 		{
-			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "porto/unsupported.wav", VOL_BASE, ATTEN_NORM);
 			Portal_ClearAll_PortalsOnly(self.realowner);
 			W_Porto_Fail(0);
 		}