Skip to content

Commit 328e61a

Browse files
committed
refactor: Disable duplicate logic
1 parent b02b820 commit 328e61a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,16 @@ void TunnelContain::onRemoving( Object *obj )
163163
obj->clearDisabled( DISABLED_HELD );
164164

165165
/// place the object in the world at position of the container m_object
166+
#if RETAIL_COMPATIBLE_CRC
166167
ThePartitionManager->registerObject( obj );
168+
#endif
167169
obj->setPosition( getObject()->getPosition() );
168170
if( obj->getDrawable() )
169171
{
170172
obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
173+
#if RETAIL_COMPATIBLE_CRC
171174
obj->getDrawable()->setDrawableHidden( false );
175+
#endif
172176
}
173177

174178
doUnloadSound();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TunnelContain.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,16 @@ void TunnelContain::onRemoving( Object *obj )
240240
obj->clearDisabled( DISABLED_HELD );
241241

242242
/// place the object in the world at position of the container m_object
243+
#if RETAIL_COMPATIBLE_CRC
243244
ThePartitionManager->registerObject( obj );
245+
#endif
244246
obj->setPosition( getObject()->getPosition() );
245247
if( obj->getDrawable() )
246248
{
247249
obj->setSafeOcclusionFrame(TheGameLogic->getFrame()+obj->getTemplate()->getOcclusionDelay());
250+
#if RETAIL_COMPATIBLE_CRC
248251
obj->getDrawable()->setDrawableHidden( false );
252+
#endif
249253
}
250254

251255
doUnloadSound();

0 commit comments

Comments
 (0)