From 917699c276ddca06e4d5427ff9b1a17c4ab55142 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 14 Mar 2025 16:11:02 -0700 Subject: [PATCH] bug fix: Supply drops no longer instant trigger when built while subdued --- .../Source/GameLogic/Object/Update/OCLUpdate.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp index 73b5fab525..e4dd50d79f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/OCLUpdate.cpp @@ -123,8 +123,15 @@ OCLUpdate::~OCLUpdate( void ) //------------------------------------------------------------------------------------------------- UpdateSleepTime OCLUpdate::update( void ) { - if( getObject()->isDisabled() ) + if(m_nextCreationFrame == 0 ) { + setNextCreationFrame(); + return UPDATE_SLEEP_NONE; + } + + if( getObject()->isDisabled() || getObject()->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) + { + // if( getObject()->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) ) return UPDATE_SLEEP_NONE;// not built yet m_nextCreationFrame++; return UPDATE_SLEEP_NONE; }