summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2015-04-04 12:38:02 +0200
committerPaweł Redman <pawel.redman@gmail.com>2015-04-04 12:38:02 +0200
commit752d1bbed1f59eb45b3c89cbddc1430d817b1102 (patch)
tree65f50394804d3565971f4e2a4d6c2c3eddbb1ee4 /src
parenteb30895efbad7f5f1ca5d943dbe87ebcd3502fa3 (diff)
Fix blob origin not being set for hitscan weapons.
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_draw.c2
-rw-r--r--src/game/g_combat.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 92e64b5..8007bfe 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -3936,7 +3936,7 @@ static void CG_DrawDamageBlobs( void )
fade = 1.0f - (float)( cg.time - blob->spawnTime ) / DAMAGE_BLOB_TIME;
- scale = cg_damageBlobSize.value /
+ scale = 0.75f * cg_damageBlobSize.value /
pow( Distance( blob->origin, cg.refdef.vieworg ), 0.5f );
Com_sprintf( str, sizeof( str ), "%d", blob->value );
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 50bfea3..0c6086d 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1474,6 +1474,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
}
else if( inflictor->s.eType == ET_MISSILE )
VectorCopy( inflictor->r.currentOrigin, blob->origin );
+ else
+ VectorCopy( point, blob->origin );
}
if( targ->health <= 0 )