From bc8ecb823dadbb5a9e5c55084d9d72997f5819ad Mon Sep 17 00:00:00 2001 From: Scott Brooks Date: Sun, 28 Jun 2009 20:54:15 +0000 Subject: [PATCH] Fixed bug 4091, see bugfix for a possible alternate fix --- reaction/game/g_weapon.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reaction/game/g_weapon.c b/reaction/game/g_weapon.c index 56ba7aa7..95038aad 100644 --- a/reaction/game/g_weapon.c +++ b/reaction/game/g_weapon.c @@ -547,6 +547,12 @@ void Bullet_Fire(gentity_t * ent, float spread, int damage, int MOD) trap_Trace(&tr, muzzle, NULL, NULL, end, passent, MASK_SHOT); // G_UndoTimeShiftFor(ent); + // we traced from the muzzle, ignoring our entity, but triggered start solid. + // lets try again from our origin since we might just be really close to another player. + if ( tr.startsolid ) { + trap_Trace(&tr, ent->client->ps.origin, NULL, NULL, end, passent, MASK_SHOT); + } + //Makro - saving the material flag to avoid useless calls to the GetMaterialFromFlag function Material = GetMaterialFromFlag(tr.surfaceFlags);