From 402937c60a0bcee0f8f3503d1e68d7bf43c51cd3 Mon Sep 17 00:00:00 2001 From: Stubbjax Date: Tue, 6 Jan 2026 13:20:46 +1100 Subject: [PATCH] bugfix: Do not show false resume construction cursor for allied scaffolds --- .../Code/GameEngine/Source/Common/RTS/ActionManager.cpp | 6 ++---- .../Code/GameEngine/Source/Common/RTS/ActionManager.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index d588bc3cf89..71465d73471 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -454,10 +454,8 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj, if( obj->isKindOf( KINDOF_DOZER ) == FALSE ) return FALSE; - Relationship r = obj->getRelationship(objectBeingConstructed); - - // only available to our allies - if( r != ALLIES ) + // TheSuperHackers @bugfix Stubbjax 06/01/2025 Ensure only the owner of the construction can resume it. + if (obj->getControllingPlayer() != objectBeingConstructed->getControllingPlayer()) return FALSE; // if the objectBeingConstructed is not actually under construction we can't resume that! diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index ee93d3a076b..600ee5ca255 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -458,10 +458,8 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj, if( obj->isKindOf( KINDOF_DOZER ) == FALSE ) return FALSE; - Relationship r = obj->getRelationship(objectBeingConstructed); - - // only available to our allies - if( r != ALLIES ) + // TheSuperHackers @bugfix Stubbjax 06/01/2025 Ensure only the owner of the construction can resume it. + if (obj->getControllingPlayer() != objectBeingConstructed->getControllingPlayer()) return FALSE; // if the objectBeingConstructed is not actually under construction we can't resume that!