Skip to content

Commit 12b2f8d

Browse files
committed
remove redundant xfer load branch in ParticleUplinkCannonUpdate
1 parent 5c75f5e commit 12b2f8d

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,16 +1455,11 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
14551455
}
14561456
else
14571457
{
1458-
// Old versions stored frame numbers, which we can't meaningfully convert to milliseconds
1458+
// Old versions stored frame numbers, read and discard to advance file position.
14591459
UnsignedInt oldLastDrivingClickFrame = 0;
14601460
UnsignedInt old2ndLastDrivingClickFrame = 0;
14611461
xfer->xferUnsignedInt( &oldLastDrivingClickFrame );
14621462
xfer->xferUnsignedInt( &old2ndLastDrivingClickFrame );
1463-
if( xfer->getXferMode() == XFER_LOAD )
1464-
{
1465-
m_lastDrivingClickTimeMsec = 0;
1466-
m_2ndLastDrivingClickTimeMsec = 0;
1467-
}
14681463
}
14691464
#endif
14701465

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,16 +1539,11 @@ void ParticleUplinkCannonUpdate::xfer( Xfer *xfer )
15391539
}
15401540
else
15411541
{
1542-
// Old versions stored frame numbers, which we can't meaningfully convert to milliseconds
1542+
// Old versions stored frame numbers, read and discard to advance file position.
15431543
UnsignedInt oldLastDrivingClickFrame = 0;
15441544
UnsignedInt old2ndLastDrivingClickFrame = 0;
15451545
xfer->xferUnsignedInt( &oldLastDrivingClickFrame );
15461546
xfer->xferUnsignedInt( &old2ndLastDrivingClickFrame );
1547-
if( xfer->getXferMode() == XFER_LOAD )
1548-
{
1549-
m_lastDrivingClickTimeMsec = 0;
1550-
m_2ndLastDrivingClickTimeMsec = 0;
1551-
}
15521547
}
15531548
#endif
15541549

0 commit comments

Comments
 (0)