diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-04-03 01:28:19 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-04-03 01:28:19 +0200 |
| commit | 53a42080d6a4e34359b86b6604c48049bcbabfad (patch) | |
| tree | 6a1c0e0de398bad0396c6078355200a54a71f6d4 | |
| parent | fe532a0393166815f0cee89e46c917ad22ccb542 (diff) | |
Make damage blobs easier to read for Aliens. Fix a bug in zapping code.
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 7ca427f..d8b411c 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -3878,7 +3878,7 @@ found_blob: blob->value = value; blob->flags = flags; VectorCopy( origin, blob->origin ); - VectorSet( blob->velocity, crandom( ) * 50, crandom( ) * 50, 300 ); + VectorSet( blob->velocity, crandom( ) * 20, crandom( ) * 20, 100 ); } static void CG_DrawNumber( float x, float y, float h, char *str ) @@ -3962,7 +3962,7 @@ static void CG_DrawDamageBlobs( void ) CG_DrawNumber( x, y, scale, str ); VectorMA( blob->origin, dt, blob->velocity, blob->origin ); - blob->velocity[ 2 ] -= 800 * dt; + blob->velocity[ 2 ] -= 300 * dt; } trap_R_SetColor( NULL ); diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 3a8c8ac..95e0b11 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1473,7 +1473,7 @@ static void G_CreateNewZap( gentity_t *creator, gentity_t *target ) { if( !zap->targets[ i ]->client || zap->targets[ i ]->client->ps.stats[ STAT_TEAM ] != TEAM_ALIENS ) - G_Damage( zap->targets[ i ], target, zap->creator, forward, target->s.origin, + G_Damage( zap->targets[ i ], target, zap->creator, forward, zap->targets[ i ]->s.origin, LEVEL2_AREAZAP_DMG * ( 1 - pow( (zap->distances[ i ] / LEVEL2_AREAZAP_CHAIN_RANGE ), LEVEL2_AREAZAP_CHAIN_FALLOFF ) ) + 1, DAMAGE_NO_KNOCKBACK | DAMAGE_NO_LOCDAMAGE, |