summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2010-08-03 23:51:51 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:41 +0000
commit121ef72645f53e5df9400ecf40b92784abac9f38 (patch)
treef66df1750602c9da9fd37a32a12468e6bef6f4cc /src/game
parent223a672628feba84c2a37a32ff60f70c86653fc9 (diff)
* Fix "overmind has awakened" CP from being sent at the incorrect time
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_buildable.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index c6576785..e0a2e93e 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2663,7 +2663,13 @@ void G_BuildableThink( gentity_t *ent, int msec )
if( !ent->spawned && ent->health > 0 )
{
if( ent->buildTime + buildTime < level.time )
+ {
ent->spawned = qtrue;
+ if( ent->s.modelindex == BA_A_OVERMIND )
+ {
+ G_TeamCommand( TEAM_ALIENS, "cp \"The Overmind has awakened!\"" );
+ }
+ }
}
// Timer actions
@@ -3645,13 +3651,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori
G_SetIdleBuildableAnim( built, BG_Buildable( buildable )->idleAnim );
if( built->builtBy >= 0 )
- {
G_SetBuildableAnim( built, BANIM_CONSTRUCT1, qtrue );
- if( buildable == BA_A_OVERMIND )
- {
- G_TeamCommand( TEAM_ALIENS, "cp \"The Overmind has awakened!\"" );
- }
- }
trap_LinkEntity( built );