Skip to content

Commit f02482c

Browse files
committed
refactor(input): Extract double-click condition to variable in ParticleUplinkCannon
1 parent 85fb536 commit f02482c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
517517
else
518518
{
519519
Real speed = data->m_manualDrivingSpeed;
520-
if( m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay )
520+
const Bool useFasterSpeed = m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay;
521+
if( useFasterSpeed )
521522
{
522523
//Because we double clicked, use the faster driving speed.
523524
speed = data->m_manualFastDrivingSpeed;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,11 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
576576
{
577577
Real speed = data->m_manualDrivingSpeed;
578578
#if !RETAIL_COMPATIBLE_CRC
579-
if( m_scriptedWaypointMode || (m_lastDrivingClickTimeMsec != 0 && m_2ndLastDrivingClickTimeMsec != 0 && m_lastDrivingClickTimeMsec - m_2ndLastDrivingClickTimeMsec < data->m_doubleClickToFastDriveDelay) )
579+
const Bool useFasterSpeed = m_scriptedWaypointMode || (m_lastDrivingClickTimeMsec != 0 && m_2ndLastDrivingClickTimeMsec != 0 && m_lastDrivingClickTimeMsec - m_2ndLastDrivingClickTimeMsec < data->m_doubleClickToFastDriveDelay);
580580
#else
581-
if( m_scriptedWaypointMode || (m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay) )
581+
const Bool useFasterSpeed = m_scriptedWaypointMode || (m_lastDrivingClickFrame - m_2ndLastDrivingClickFrame < data->m_doubleClickToFastDriveDelay);
582582
#endif
583+
if( useFasterSpeed )
583584
{
584585
//Because we double clicked, use the faster driving speed.
585586
speed = data->m_manualFastDrivingSpeed;

0 commit comments

Comments
 (0)