Skip to content

Commit 7913420

Browse files
committed
unify: Apply AssistedTargetingUpdate::update logic from Zero Hour to Generals
1 parent d379654 commit 7913420

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,11 @@ void AssistedTargetingUpdate::makeFeedbackLaser( const ThingTemplate *laserTempl
138138
//-------------------------------------------------------------------------------------------------
139139
UpdateSleepTime AssistedTargetingUpdate::update()
140140
{
141-
142141
const AssistedTargetingUpdateModuleData *d = getAssistedTargetingUpdateModuleData();
143142

144143
m_laserFromAssisted = TheThingFactory->findTemplate( d->m_laserFromAssistedName );
145-
146-
147144
m_laserToTarget = TheThingFactory->findTemplate( d->m_laserToTargetName );
148145

149-
150146
return UPDATE_SLEEP_FOREVER;
151147
}
152148

0 commit comments

Comments
 (0)