about summary refs log tree commit diff
path: root/src/game/client/components/items.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-29 05:34:18 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-29 05:34:18 +0000
commit0511e1152a13ad99b51a819a75ef457404e86d4c (patch)
treed8e31b98f18f7e027ee72a9792248072d93e5852 /src/game/client/components/items.cpp
parentb22dd1488cdae53d27215fda051fea9bfc72ac1d (diff)
downloadzcatch-0511e1152a13ad99b51a819a75ef457404e86d4c.tar.gz
zcatch-0511e1152a13ad99b51a819a75ef457404e86d4c.zip
added sound component
Diffstat (limited to 'src/game/client/components/items.cpp')
-rw-r--r--src/game/client/components/items.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp
index 15cc7524..43a3224a 100644
--- a/src/game/client/components/items.cpp
+++ b/src/game/client/components/items.cpp
@@ -23,18 +23,18 @@ void ITEMS::render_projectile(const NETOBJ_PROJECTILE *current, int itemid)
 	float speed = 0;
 	if(current->type == WEAPON_GRENADE)
 	{
-		curvature = tuning.grenade_curvature;
-		speed = tuning.grenade_speed;
+		curvature = gameclient.tuning.grenade_curvature;
+		speed = gameclient.tuning.grenade_speed;
 	}
 	else if(current->type == WEAPON_SHOTGUN)
 	{
-		curvature = tuning.shotgun_curvature;
-		speed = tuning.shotgun_speed;
+		curvature = gameclient.tuning.shotgun_curvature;
+		speed = gameclient.tuning.shotgun_speed;
 	}
 	else if(current->type == WEAPON_GUN)
 	{
-		curvature = tuning.gun_curvature;
-		speed = tuning.gun_speed;
+		curvature = gameclient.tuning.gun_curvature;
+		speed = gameclient.tuning.gun_speed;
 	}
 
 	float ct = (client_tick()-current->start_tick)/(float)SERVER_TICK_SPEED + client_ticktime()*1/(float)SERVER_TICK_SPEED;
@@ -151,7 +151,7 @@ void ITEMS::render_laser(const struct NETOBJ_LASER *current)
 
 	float ticks = client_tick() + client_intratick() - current->start_tick;
 	float ms = (ticks/50.0f) * 1000.0f;
-	float a =  ms / tuning.laser_bounce_delay;
+	float a =  ms / gameclient.tuning.laser_bounce_delay;
 	a = clamp(a, 0.0f, 1.0f);
 	float ia = 1-a;