about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-02-04 07:36:54 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-02-04 07:36:54 +0000
commitdd1e7adc00b8020fd163a051a6fc6109eeca332b (patch)
treeebd96a60c2d55de1dab1d80e9863cab170bf7eb6 /src/game
parentd76661b3be30a78203438d53bd91657006d930a9 (diff)
downloadzcatch-dd1e7adc00b8020fd163a051a6fc6109eeca332b.tar.gz
zcatch-dd1e7adc00b8020fd163a051a6fc6109eeca332b.zip
fixed sound positioning bug, tweaked laser effect, fixed memory dumping
Diffstat (limited to 'src/game')
-rw-r--r--src/game/client/gc_render_obj.cpp3
-rw-r--r--src/game/g_tuning.h6
-rw-r--r--src/game/server/gs_server.cpp2
3 files changed, 5 insertions, 6 deletions
diff --git a/src/game/client/gc_render_obj.cpp b/src/game/client/gc_render_obj.cpp
index 6f836307..1e1d6430 100644
--- a/src/game/client/gc_render_obj.cpp
+++ b/src/game/client/gc_render_obj.cpp
@@ -152,10 +152,9 @@ void render_laser(const struct obj_laser *current)
 	float ia = 1-a;
 	
 	
-	
 	vec2 out(dir.y, -dir.x);
 	
-	out = out * (4.0f*ia);
+	out = out * (6.0f*ia);
 
 	gfx_blend_normal();
 	gfx_texture_set(-1);
diff --git a/src/game/g_tuning.h b/src/game/g_tuning.h
index e23b46bf..c2201889 100644
--- a/src/game/g_tuning.h
+++ b/src/game/g_tuning.h
@@ -24,6 +24,6 @@ MACRO_TUNING_PARAM(grenade_speed, 15.0f)
 
 MACRO_TUNING_PARAM(laser_reach, 800.0f)
 MACRO_TUNING_PARAM(laser_bounce_delay, 150)
-MACRO_TUNING_PARAM(laser_bounce_num, 2)
-MACRO_TUNING_PARAM(laser_bounce_cost, 32)
-MACRO_TUNING_PARAM(laser_damage, 8)
+MACRO_TUNING_PARAM(laser_bounce_num, 1)
+MACRO_TUNING_PARAM(laser_bounce_cost, 0)
+MACRO_TUNING_PARAM(laser_damage, 6)
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 4a95406e..41dc18a3 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -424,7 +424,7 @@ void projectile::tick()
 	if(targetplayer || collide || lifespan < 0)
 	{
 		if (lifespan >= 0 || weapon == WEAPON_GRENADE)
-			create_sound(pos, sound_impact);
+			create_sound(curpos, sound_impact);
 
 		if (flags & PROJECTILE_FLAGS_EXPLODE)
 			create_explosion(prevpos, owner, weapon, false);