From b84635cbb05cf6a531763c7b8bc26b7a87aebe2e Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Tue, 29 Apr 2025 21:05:09 +0200 Subject: [PATCH] [GEN][ZH] Fixed garrison points not initialized before first use (#783) --- .../Source/GameLogic/Object/Contain/OpenContain.cpp | 6 +++--- .../Source/GameLogic/Object/Contain/OpenContain.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 8b59526c5d..8da6ec06b7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -324,15 +324,15 @@ void OpenContain::addToContain( Object *rider ) addOrRemoveObjFromWorld(rider, false); } - // ensure our contents are positions correctly. - redeployOccupants(); - // trigger an onContaining event for the object that just "ate" something if( getObject()->getContain() ) { getObject()->getContain()->onContaining( rider ); } + // ensure our contents are positions correctly. + redeployOccupants(); + // trigger an onContainedBy event for the object that just got "eaten" by us rider->onContainedBy( getObject() ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp index 0407b838b5..da317a5a39 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp @@ -346,15 +346,15 @@ void OpenContain::addToContain( Object *rider ) addOrRemoveObjFromWorld(rider, false); } - // ensure our contents are positions correctly. - redeployOccupants(); - // trigger an onContaining event for the object that just "ate" something if( getObject()->getContain() ) { getObject()->getContain()->onContaining( rider, wasSelected ); } + // ensure our contents are positions correctly. + redeployOccupants(); + // trigger an onContainedBy event for the object that just got "eaten" by us rider->onContainedBy( getObject() );