Use bound for degreespersegment

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index f2b60db00ac405f2b17a5a90a5b7f4e49d10e98c..7cd88650e522d60e8b7a18f9adbdb292c43db213 100644 (file)
--- 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 a6b7fddbbf82ceceab8ed19bd6407d158acec1c8..7aa67b33930e49557136cb8ea4052828eaee7027 100644 (file)
--- 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
                        );