summaryrefslogtreecommitdiff
path: root/src/game/g_buildable.c
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2014-07-12 16:18:47 +0200
committerenneract <trem.redman@gmail.com>2014-07-12 17:06:40 +0200
commit3864f3233c2ce7ccce4ac05a44bed7c200836543 (patch)
treec8c460d32a8a10437e3777d5106a95d837c034e2 /src/game/g_buildable.c
parentfaabf7d64658ae47842b4ccabdb4b68513f3cdf7 (diff)
remedy some code failures
(not sure about the effects)
Diffstat (limited to 'src/game/g_buildable.c')
-rw-r--r--src/game/g_buildable.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 3114792..efac6b3 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2407,10 +2407,8 @@ void HMGTurret_Think( gentity_t *self )
if( !self->powered )
{
// if power loss drop turret
- if( self->spawned &&
- HMGTurret_State( self, MGT_STATE_INACTIVE ) );
- return;
-
+ if( self->spawned )
+ HMGTurret_State( self, MGT_STATE_INACTIVE );
return;
}
if( !self->spawned )
@@ -3736,7 +3734,7 @@ static gentity_t *G_FinishSpawningBuildable( gentity_t *ent, qboolean force )
else
VectorSet( normal, 0.0f, 0.0f, 1.0f );
- built = G_Build( ent, buildable, ent->s.pos.trBase, normal, ent->s.angles, built->cuboidSize );
+ built = G_Build( ent, buildable, ent->s.pos.trBase, normal, ent->s.angles, ent->cuboidSize );
built->takedamage = qtrue;
built->spawned = qtrue; //map entities are already spawned