From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 May 2010 14:05:27 +0000 (+0000)
Subject: Limits for part 2.
X-Git-Tag: xonotic-v0.1.0preview~516
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=339d8c46db5725787cd1d572038d47713a63e1fe;p=xonotic%2Fdarkplaces.git

Limits for part 2.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10132 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b801f2e6336a273e2fede59039bc393185a6f061
---

diff --git a/view.c b/view.c
index 4172d096..39c4be9c 100644
--- a/view.c
+++ b/view.c
@@ -655,19 +655,49 @@ void V_CalcRefdef (void)
 				// gun model following code
 
 				if(gunorg_follow[0] < vieworg[0])
-					gunorg_follow[0] += (vieworg[0] - gunorg_follow[0]) * 5 * ef_speed;
+				{
+					if(vieworg[0] - gunorg_follow[0] > 5)
+						gunorg_follow[0] = vieworg[0] - 5;
+					else
+						gunorg_follow[0] += (vieworg[0] - gunorg_follow[0]) * 5 * ef_speed;
+				}
 				if(gunorg_follow[0] > vieworg[0])
-					gunorg_follow[0] -= (gunorg_follow[0] - vieworg[0]) * 5 * ef_speed;
+				{
+					if(gunorg_follow[0] - vieworg[0] > 5)
+						gunorg_follow[0] = vieworg[0] + 5;
+					else
+						gunorg_follow[0] -= (gunorg_follow[0] - vieworg[0]) * 5 * ef_speed;
+				}
 
 				if(gunorg_follow[1] < vieworg[1])
-					gunorg_follow[1] += (vieworg[1] - gunorg_follow[1]) * 5 * ef_speed;
+				{
+					if(vieworg[1] - gunorg_follow[1] > 5)
+						gunorg_follow[1] = vieworg[1] - 5;
+					else
+						gunorg_follow[1] += (vieworg[1] - gunorg_follow[1]) * 5 * ef_speed;
+				}
 				if(gunorg_follow[1] > vieworg[1])
-					gunorg_follow[1] -= (gunorg_follow[1] - vieworg[1]) * 5 * ef_speed;
+				{
+					if(gunorg_follow[1] - vieworg[1] > 5)
+						gunorg_follow[1] = vieworg[1] + 5;
+					else
+						gunorg_follow[1] -= (gunorg_follow[1] - vieworg[1]) * 5 * ef_speed;
+				}
 
 				if(gunorg_follow[2] < vieworg[2])
-					gunorg_follow[2] += (vieworg[2] - gunorg_follow[2]) * 5 * ef_speed;
+				{
+					if(vieworg[2] - gunorg_follow[2] > 5)
+						gunorg_follow[2] = vieworg[2] - 5;
+					else
+						gunorg_follow[2] += (vieworg[2] - gunorg_follow[2]) * 5 * ef_speed;
+				}
 				if(gunorg_follow[2] > vieworg[2])
-					gunorg_follow[2] -= (gunorg_follow[2] - vieworg[2]) * 5 * ef_speed;
+				{
+					if(gunorg_follow[2] - vieworg[2] > 5)
+						gunorg_follow[2] = vieworg[2] + 5;
+					else
+						gunorg_follow[2] -= (gunorg_follow[2] - vieworg[2]) * 5 * ef_speed;
+				}
 
 				VectorCopy(gunorg_follow, gunorg);
 				}