From 7229789d58726ccea5c462dbe35a65f7388da658 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Tue, 18 Mar 2008 22:19:59 +0000 Subject: tweaked projectile radius. reduced damage of the rifle to 5 instead of 6 --- src/game/g_tuning.h | 2 +- src/game/server/gs_server.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/game/g_tuning.h b/src/game/g_tuning.h index 80b3310f..e926ad89 100644 --- a/src/game/g_tuning.h +++ b/src/game/g_tuning.h @@ -31,4 +31,4 @@ MACRO_TUNING_PARAM(laser_reach, 800.0f) MACRO_TUNING_PARAM(laser_bounce_delay, 150) MACRO_TUNING_PARAM(laser_bounce_num, 1) MACRO_TUNING_PARAM(laser_bounce_cost, 0) -MACRO_TUNING_PARAM(laser_damage, 6) +MACRO_TUNING_PARAM(laser_damage, 5) diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 604e2f0d..3b7d4392 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -443,7 +443,7 @@ void projectile::tick() int collide = col_check_point((int)curpos.x, (int)curpos.y); vec2 new_pos; - entity *targetplayer = (entity*)intersect_player(prevpos, curpos, 8.0f, new_pos, powner); + entity *targetplayer = (entity*)intersect_player(prevpos, curpos, 6.0f, new_pos, powner); if(targetplayer || collide || lifespan < 0) { @@ -503,7 +503,7 @@ laser::laser(vec2 pos, vec2 direction, float start_energy, player *owner) bool laser::hit_player(vec2 from, vec2 to) { vec2 at; - player *hit = intersect_player(pos, to, 8.0f, at, owner); + player *hit = intersect_player(pos, to, 0.0f, at, owner); if(!hit) return false; -- cgit 1.4.1