diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-13 05:08:15 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-13 05:08:15 +0000 |
| commit | 06970828585e1fda9f4f0a71d6f5e040a8cd4d30 (patch) | |
| tree | 105cdd3e467d13127949a8bf037beaab635cbd50 /src/game | |
| parent | d975233fbcce187811490ddf4fe3783294baf5a4 (diff) | |
* Reduced strength of teslagen
* Fixed the broken buildables bug for real this time (fingers crossed)
* Disabled firing modes for destroyed buildables
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_buildable.c | 8 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 26a9bdbb..75284a09 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -439,6 +439,7 @@ void ASpawn_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int self->die = nullDieFunction; self->think = ASpawn_Blast; self->nextthink = level.time + 5000; //wait .5 seconds before damaging others + self->s.eFlags &= ~EF_FIRING; //prevent any firing effects if( attacker && attacker->client && attacker->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) { @@ -652,6 +653,7 @@ void ABarricade_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, self->die = nullDieFunction; self->think = ABarricade_Blast; + self->s.eFlags &= ~EF_FIRING; //prevent any firing effects self->nextthink = level.time + 5000; } @@ -998,6 +1000,7 @@ void AHovel_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int //pretty events and item cleanup self->s.eFlags |= EF_NODRAW; //don't draw the model once its destroyed G_AddEvent( self, EV_ALIEN_BUILDABLE_EXPLOSION, DirToByte( dir ) ); + self->s.eFlags &= ~EF_FIRING; //prevent any firing effects self->timestamp = level.time; self->think = ASpawn_Melt; self->nextthink = level.time + 500; //wait .5 seconds before damaging others @@ -1839,6 +1842,7 @@ void HSpawn_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int self->think = HSpawn_Blast; self->nextthink = level.time + HUMAN_DETONATION_DELAY; self->powered = qfalse; //free up power + self->s.eFlags &= ~EF_FIRING; //prevent any firing effects if( attacker && attacker->client && attacker->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS ) { @@ -2160,8 +2164,6 @@ gentity_t *G_buildItem( gentity_t *builder, buildable_t buildable, vec3_t origin built->splashRadius = BG_FindSplashRadiusForBuildable( buildable ); built->splashMethodOfDeath = BG_FindMODForBuildable( buildable ); - G_setIdleBuildableAnim( built, BG_FindAnimForBuildable( buildable ) ); - built->nextthink = BG_FindNextThinkForBuildable( buildable ); built->takedamage = qfalse; @@ -2320,6 +2322,8 @@ gentity_t *G_buildItem( gentity_t *builder, buildable_t buildable, vec3_t origin G_AddEvent( built, EV_BUILD_CONSTRUCT, 0 ); + G_setIdleBuildableAnim( built, BG_FindAnimForBuildable( buildable ) ); + if( built->builtBy >= 0 ) G_setBuildableAnim( built, BANIM_CONSTRUCT1, qtrue ); diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index c6a8759e..d036c0f5 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -809,7 +809,10 @@ qboolean CheckPounceAttack( gentity_t *ent ) return qfalse; if( ent->client->ps.groundEntityNum != ENTITYNUM_NONE ) + { + ent->client->allowedToPounce = qfalse; return qfalse; + } // set aiming directions AngleVectors( ent->client->ps.viewangles, forward, right, up ); diff --git a/src/game/tremulous.h b/src/game/tremulous.h index c0be2e3b..42dc922f 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -464,7 +464,7 @@ #define TESLAGEN_SPLASHRADIUS 100 #define TESLAGEN_REPEAT 500 #define TESLAGEN_RANGE 750 -#define TESLAGEN_DMG HDM(50) +#define TESLAGEN_DMG HDM(20) #define DC_BP 80 #define DC_BT 10000 |