Skip to content

- Fix delayed particle effect timing at 60Hz #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jaredl-Dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

- Fix delayed particle effect timing at 60Hz #577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Core/GameEngine/Source/GameClient/FXList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,12 @@ class ParticleSystemFXNugget : public FXNugget
Real delayInMsec = m_delay.getValue();
if (delayInMsec >= 0.0f)
{
UnsignedInt delayInFrames = REAL_TO_INT_CEIL(ConvertDurationFromMsecsToFrames(delayInMsec));
sys->setInitialDelay(delayInFrames);
Real delayInFrames = ConvertDurationFromMsecsToFrames(delayInMsec);
#if defined(GENERALS_ONLINE_HIGH_FPS_RENDER)
// Info: Particle systems update on legacy frames, so their delays must use the same cadence at 60Hz.
delayInFrames /= GENERALS_ONLINE_HIGH_FPS_FRAME_MULTIPLIER;
#endif
sys->setInitialDelay(REAL_TO_INT_CEIL(delayInFrames));
}

if( m_useCallersRadius && overrideRadius )
Expand Down
Loading