diff options
| author | Tim Angus <tim@ngus.net> | 2001-09-19 22:44:11 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-09-19 22:44:11 +0000 |
| commit | 5c6c20cfb07fb6f223daf4679bf20d2e11c76a37 (patch) | |
| tree | 2beda8782208ff80da64f5920fc53d389ffacb86 /src/game | |
| parent | 93b163274c3726e87aab10b8494d5a910efe45db (diff) | |
More integration of TA UI stuff
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 2 | ||||
| -rw-r--r-- | src/game/bg_public.h | 3 | ||||
| -rw-r--r-- | src/game/g_missile.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 30d71fa9..685a0617 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2343,7 +2343,7 @@ static void PM_Weapon( void ) addTime = 800; break; case WP_FLAMER: - addTime = 70; + addTime = 40; break; case WP_RAILGUN: addTime = 1500; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 2195db13..e03ef4bd 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -327,6 +327,9 @@ typedef enum { HI_NUM_HOLDABLE } holdable_t; +//TA: needed client side to size sprites +#define FIREBALL_LIFETIME 1500.0f + typedef enum { WP_NONE, diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 46fe9239..8b2aba73 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -83,7 +83,7 @@ void G_ExplodeMissile( gentity_t *ent ) { ent->s.eType = ET_GENERAL; //TA: tired... can't be fucked... hack - if( ent->s.weapon != WP_LOCKBLOB_LAUNCHER ) + if( ent->s.weapon != WP_LOCKBLOB_LAUNCHER && ent->s.weapon != WP_FLAMER ) G_AddEvent( ent, EV_MISSILE_MISS, DirToByte( dir ) ); ent->freeAfterEvent = qtrue; @@ -309,7 +309,7 @@ gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t dir ) bolt = G_Spawn(); bolt->classname = "flame"; - bolt->nextthink = level.time + 600; + bolt->nextthink = level.time + FIREBALL_LIFETIME; bolt->think = G_ExplodeMissile; bolt->s.eType = ET_MISSILE; bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN; @@ -328,7 +328,7 @@ gentity_t *fire_flamer( gentity_t *self, vec3_t start, vec3_t dir ) bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame VectorCopy( start, bolt->s.pos.trBase ); //VectorMA( self->client->ps.velocity, 300, dir, bolt->s.pos.trDelta ); - VectorScale( dir, 350, bolt->s.pos.trDelta ); + VectorScale( dir, 200, bolt->s.pos.trDelta ); SnapVector( bolt->s.pos.trDelta ); // save net bandwidth VectorCopy (start, bolt->r.currentOrigin); |