From dd1e7adc00b8020fd163a051a6fc6109eeca332b Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 4 Feb 2008 07:36:54 +0000 Subject: fixed sound positioning bug, tweaked laser effect, fixed memory dumping --- src/game/client/gc_render_obj.cpp | 3 +-- src/game/g_tuning.h | 6 +++--- src/game/server/gs_server.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/game') 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); -- cgit 1.4.1