summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-04-03 00:04:10 +0000
committerTim Angus <tim@ngus.net>2001-04-03 00:04:10 +0000
commit2210319386ab172899bc6ff56c0523f4d7b33a27 (patch)
treee556446f7771245d3fc71e785e68532f7fac9cc8 /src/game
parent014043dcd74651283e1f2c1b2f8ac00f61676e4a (diff)
Fixed the bug introduced through fixing the last bug
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_buildable.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 7d8e6343..d688a416 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -679,22 +679,12 @@ itemBuildError_t itemFits( gentity_t *ent, buildable_t buildable, int distance )
}
}
- if( !(
- !Q_stricmp( closestPower->classname, "team_human_reactor" ) &&
- ( minDistance <= REACTOR_BASESIZE )
- ) &&
- !(
- !Q_stricmp( closestPower->classname, "team_human_repeater" ) &&
- ( minDistance <= REPEATER_BASESIZE ) &&
- ( buildable == BA_H_SPAWN ) &&
- closestPower->powered
- ) &&
- !(
- !Q_stricmp( closestPower->classname, "team_human_repeater" ) &&
- ( minDistance <= REPEATER_BASESIZE ) &&
- closestPower->active &&
- closestPower->powered
- )
+ if( !(( !Q_stricmp( closestPower->classname, "team_human_reactor" ) &&
+ minDistance <= REACTOR_BASESIZE ) ||
+ ( !Q_stricmp( closestPower->classname, "team_human_repeater" ) &&
+ minDistance <= REPEATER_BASESIZE &&
+ ( ( buildable == BA_H_SPAWN && closestPower->powered ) ||
+ ( closestPower->powered && closestPower->active ) ) ) )
)
{
if( buildable != BA_H_REACTOR && buildable != BA_H_REPEATER )