From 699e9e8012eec660002c4a24bab6532b57cc337d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 3 Oct 2009 11:30:09 +0000
Subject: * (bug 3480) A reactor that has not yet exploded still gives power
(benmachine) * (bug 3492) G_SelectiveRadiusDamage called too many times in
HReactor_Think (benmachine) * (bug 3497) Wrong variable is
compared to MAX_ in G_admin_readconfig (benmachine)
---
src/game/g_admin.c | 2 +-
src/game/g_buildable.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index 3c3107db..a6004b8f 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -1301,7 +1301,7 @@ qboolean G_admin_readconfig( gentity_t *ent, int skiparg )
}
else if( !Q_stricmp( t, "[command]" ) )
{
- if( bc >= MAX_ADMIN_COMMANDS )
+ if( cc >= MAX_ADMIN_COMMANDS )
return qfalse;
c = G_Alloc( sizeof( g_admin_command_t ) );
*c->command = '\0';
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 33424d61..e44623ee 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -198,7 +198,7 @@ static qboolean G_FindPower( gentity_t *self )
distance = VectorLength( temp_v );
// Always prefer a reactor if there is one in range
- if( ent->s.modelindex == BA_H_REACTOR &&
+ if( ent->s.modelindex == BA_H_REACTOR && ent->powered &&
distance <= REACTOR_BASESIZE )
{
self->parentNode = ent;
@@ -792,6 +792,8 @@ void AOvermind_Think( gentity_t *self )
G_SelectiveRadiusDamage( self->s.pos.trBase, self, self->splashDamage,
self->splashRadius, self, MOD_OVERMIND, PTE_ALIENS );
G_SetBuildableAnim( self, BANIM_ATTACK1, qfalse );
+
+ break;
}
}
--
cgit