about summary refs log tree commit diff
path: root/src/game/g_game.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-29 21:39:41 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-29 21:39:41 +0000
commit7bc733dc10f3d01985021b7b5d6ae140dd5af6f1 (patch)
treec9b0fcd8d128ec9abd40c10dfe4fcf245650a870 /src/game/g_game.cpp
parent0dab7db963e2706182ea120c98f746f5e265c14c (diff)
downloadzcatch-7bc733dc10f3d01985021b7b5d6ae140dd5af6f1.tar.gz
zcatch-7bc733dc10f3d01985021b7b5d6ae140dd5af6f1.zip
large update. cleaned up some code. added new effects for almost everything
Diffstat (limited to 'src/game/g_game.cpp')
-rw-r--r--src/game/g_game.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/g_game.cpp b/src/game/g_game.cpp
index 66da6295..98ae8c47 100644
--- a/src/game/g_game.cpp
+++ b/src/game/g_game.cpp
@@ -284,7 +284,7 @@ void player_core::tick()
 				hookvel.x *= 0.75f;
 			
 			vec2 new_vel = vel+hookvel;
-			
+
 			// check if we are under the legal limit for the hook
 			if(length(new_vel) < hook_drag_speed || length(new_vel) < length(vel))
 				vel = new_vel; // no problem. apply
@@ -348,8 +348,8 @@ void player_core::tick()
 	}	
 
 	// clamp the velocity to something sane
-	if(length(vel) > 100.0f)
-		vel = normalize(vel) * 100.0f;
+	if(length(vel) > terminal_velocity)
+		vel = normalize(vel) * terminal_velocity;
 }
 
 void player_core::move()