From: Samual Lenks <samual@xonotic.org>
Date: Thu, 27 Feb 2014 01:23:01 +0000 (-0500)
Subject: Use bound for degreespersegment
X-Git-Tag: xonotic-v0.8.0~152^2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f9555e7fb4a0df8c179f88f22c353af565ea6be;p=xonotic%2Fxonotic-data.pk3dir.git

Use bound for degreespersegment
---

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index f2b60db00..7cd88650e 100644
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -586,17 +586,15 @@ void Draw_ArcBeam()
 
 			if(WEP_CVAR(arc, beam_degreespersegment))
 			{
-				segments = min(
-					max(
-						1,
-						(
-							min(
-								angle,
-								WEP_CVAR(arc, beam_maxangle)
-							)
-							/
-							WEP_CVAR(arc, beam_degreespersegment)
+				segments = bound(
+					1, 
+					(
+						min(
+							angle,
+							WEP_CVAR(arc, beam_maxangle)
 						)
+						/
+						WEP_CVAR(arc, beam_degreespersegment)
 					),
 					max_allowed_segments
 				);
@@ -640,17 +638,15 @@ void Draw_ArcBeam()
 
 			if(WEP_CVAR(arc, beam_degreespersegment))
 			{
-				segments = min(
-					max(
-						1,
-						(
-							min(
-								angle,
-								WEP_CVAR(arc, beam_maxangle)
-							)
-							/
-							WEP_CVAR(arc, beam_degreespersegment)
+				segments = bound(
+					1, 
+					(
+						min(
+							angle,
+							WEP_CVAR(arc, beam_maxangle)
 						)
+						/
+						WEP_CVAR(arc, beam_degreespersegment)
 					),
 					max_allowed_segments
 				);
diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index a6b7fddbb..7aa67b339 100644
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -272,17 +272,15 @@ void W_Arc_Beam_Think(void)
 
 		if(WEP_CVAR(arc, beam_degreespersegment))
 		{
-			segments = min(
-				max(
-					1,
-					(
-						min(
-							angle,
-							WEP_CVAR(arc, beam_maxangle)
-						)
-						/
-						WEP_CVAR(arc, beam_degreespersegment)
+			segments = bound(
+				1, 
+				(
+					min(
+						angle,
+						WEP_CVAR(arc, beam_maxangle)
 					)
+					/
+					WEP_CVAR(arc, beam_degreespersegment)
 				),
 				max_allowed_segments
 			);