From 8f9555e7fb4a0df8c179f88f22c353af565ea6be Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Wed, 26 Feb 2014 20:23:01 -0500 Subject: [PATCH] Use bound for degreespersegment --- qcsrc/client/particles.qc | 36 ++++++++++++++++------------------- qcsrc/common/weapons/w_arc.qc | 18 ++++++++---------- 2 files changed, 24 insertions(+), 30 deletions(-) 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 ); -- 2.39.2