From 2cada8d93653324cb90fc81d4eb670bab9af089a Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Fri, 13 Apr 2018 12:17:34 +0200 Subject: Better explosion graphics. --- src/game/unit_soldier.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/game/unit_soldier.cpp') diff --git a/src/game/unit_soldier.cpp b/src/game/unit_soldier.cpp index f4432bf..c6ed4dd 100644 --- a/src/game/unit_soldier.cpp +++ b/src/game/unit_soldier.cpp @@ -85,7 +85,8 @@ void unit_soldier_t::shoot(v2f_t aim) end = x + (aim - x).norm() * 40; trace = world->ray_v_all(x, end, CF_SOLID|CF_BODY|CF_BODY_SMALL, this); - if (trace.hit && trace.ent && trace.ent->type == ET_UNIT) { + if (!manual_firing && trace.hit && + trace.ent && trace.ent->type == ET_UNIT) { unit_t *unit = dynamic_cast(trace.ent); // Refuse to shoot friendlies. @@ -98,7 +99,7 @@ void unit_soldier_t::shoot(v2f_t aim) tracer = new fx_tracer_t(game, muzzle_point, trace.end); tracer->place(&game->world); - flash = new fx_flash_t(game, muzzle_point, 5.0f); + flash = new fx_flash_t(game, muzzle_point, 5.0f, sf::Color(255, 170, 50, 80)); flash->place(&game->world); last_attack = game->now; -- cgit