Skip to content

Commit 4098912

Browse files
committed
unify: Apply update and loadPostProcess logic from Zero Hour to Generals
1 parent ffa911a commit 4098912

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ void AssistedTargetingUpdate::makeFeedbackLaser( const ThingTemplate *laserTempl
137137
//-------------------------------------------------------------------------------------------------
138138
UpdateSleepTime AssistedTargetingUpdate::update()
139139
{
140+
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();
141+
142+
m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
143+
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );
144+
140145
return UPDATE_SLEEP_FOREVER;
141146
}
142147

@@ -174,8 +179,11 @@ void AssistedTargetingUpdate::xfer( Xfer *xfer )
174179
// ------------------------------------------------------------------------------------------------
175180
void AssistedTargetingUpdate::loadPostProcess()
176181
{
182+
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();
183+
184+
m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
185+
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );
177186

178187
// extend base class
179188
UpdateModule::loadPostProcess();
180-
181189
}

0 commit comments

Comments
 (0)