From 032882cf76d8056b0b0e0b7e8ef67669f12b17d7 Mon Sep 17 00:00:00 2001 From: ChthonVII Date: Wed, 20 Mar 2024 21:56:09 +0900 Subject: [PATCH] reorder conditional to disallow stop command for "movable" buildings (MCV plus things with rally points) during (de)construction. --- TIBERIANDAWN/DLLInterface.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/TIBERIANDAWN/DLLInterface.cpp b/TIBERIANDAWN/DLLInterface.cpp index 517837a80..1433f27af 100644 --- a/TIBERIANDAWN/DLLInterface.cpp +++ b/TIBERIANDAWN/DLLInterface.cpp @@ -7094,13 +7094,8 @@ void DLLExportClass::Selected_Stop(uint64 player_id) //if (tech && (tech->Can_Player_Move() || (tech->Can_Player_Fire() && // tech->What_Am_I() != RTTI_BUILDING))) { if ( tech && - ( tech->Can_Player_Move() || - ( tech->Can_Player_Fire() && - ( (tech->What_Am_I() != RTTI_BUILDING) || - ((BuildingClass*)tech) -> CanAcceptStopOrder() - ) - ) - ) + (tech->Can_Player_Move() || tech->Can_Player_Fire()) && + ((tech->What_Am_I() != RTTI_BUILDING) || ((BuildingClass*)tech) -> CanAcceptStopOrder()) ) { OutList.Add(EventClass(EventClass::IDLE, tech->As_Target())); }