Skip to content

Commit 0cc9d11

Browse files
committed
chore: Move immobile continue logic above shroud condition
1 parent 1e2f9e0 commit 0cc9d11

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,14 +683,17 @@ Bool BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos,
683683
if (them->isKindOf(KINDOF_INERT))
684684
continue;
685685

686+
if (them->isKindOf(KINDOF_IMMOBILE)) {
687+
if (onlyCheckEnemies && builderObject && builderObject->getRelationship(them) != ENEMIES) {
688+
continue;
689+
}
690+
}
691+
686692
if (builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED)
687693
return false;
688694

689695
// an immobile object may obstruct our building depending on flags.
690696
if( them->isKindOf( KINDOF_IMMOBILE ) ) {
691-
if (onlyCheckEnemies && builderObject && builderObject->getRelationship( them ) != ENEMIES ) {
692-
continue;
693-
}
694697
TheTerrainVisual->addFactionBib(them, true);
695698
return false;
696699
}

GeneralsMD/Code/GameEngine/Source/Common/System/BuildAssistant.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,12 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
705705
if (them->isKindOf(KINDOF_INERT))
706706
continue;
707707

708+
if (them->isKindOf(KINDOF_IMMOBILE))
709+
{
710+
if (onlyCheckEnemies && builderObject && rel != ENEMIES)
711+
continue;
712+
}
713+
708714
if (builderObject && them->getShroudedStatus(builderObject->getControllingPlayer()->getPlayerIndex()) >= OBJECTSHROUD_FOGGED)
709715
return LBC_SHROUD;
710716

@@ -721,10 +727,6 @@ LegalBuildCode BuildAssistant::isLocationClearOfObjects( const Coord3D *worldPos
721727
// an immobile object may obstruct our building depending on flags.
722728
if( them->isKindOf( KINDOF_IMMOBILE ) )
723729
{
724-
if (onlyCheckEnemies && builderObject && rel != ENEMIES )
725-
{
726-
continue;
727-
}
728730
if( feedbackWithFailure )
729731
{
730732
TheTerrainVisual->addFactionBib( them, TRUE );

0 commit comments

Comments
 (0)