Skip to content

bugfix(particlesys): Restore Particle System IDs on save load before registering to ParticleSystemManager #2316

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

Merged
xezon merged 6 commits into from
Feb 18, 2026
Merged

bugfix(particlesys): Restore Particle System IDs on save load before registering to ParticleSystemManager #2316

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cbe0ab
bugfix(savegame): Restore particle system IDs before registation with…
stephanmeesters Feb 16, 2026
bb08bce
Remove unnecessary uniqueSystemID assignment
stephanmeesters Feb 17, 2026
e962c05
Style touchup
stephanmeesters Feb 17, 2026
5299ad1
Ensure proper cleanup on throw
stephanmeesters Feb 17, 2026
fd25892
Better cleanup code
stephanmeesters Feb 18, 2026
154276a
Formatting
stephanmeesters Feb 18, 2026
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
30 changes: 20 additions & 10 deletions Core/GameEngine/Source/GameClient/System/ParticleSys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,10 @@ ParticleSystem::ParticleSystem( const ParticleSystemTemplate *sysTemplate,
m_personalityStore = 0;
m_controlParticle = nullptr;

TheParticleSystemManager->friend_addParticleSystem(this);
if ( m_systemID != INVALID_PARTICLE_SYSTEM_ID )
{
TheParticleSystemManager->friend_addParticleSystem(this);
}

//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
}
Expand Down Expand Up @@ -1260,7 +1263,10 @@ ParticleSystem::~ParticleSystem()

m_controlParticle = nullptr;

TheParticleSystemManager->friend_removeParticleSystem(this);
if ( m_systemID != INVALID_PARTICLE_SYSTEM_ID )
{
TheParticleSystemManager->friend_removeParticleSystem(this);
}
//DEBUG_ASSERTLOG(!(m_totalParticleSystemCount % 10 == 0), ( "TotalParticleSystemCount = %d", m_totalParticleSystemCount ));
}

Expand Down Expand Up @@ -3364,20 +3370,24 @@ void ParticleSystemManager::xfer( Xfer *xfer )
}

// create system
system = createParticleSystem( systemTemplate, FALSE );
// TheSuperHackers @bugfix stephanmeesters 16/02/2026
// Particle systems originally were assigned an incrementing system ID in the constructor that did not
// always match the ID that was xfer'd. When using findParticleSystem this would cause master/slave lookups to fail.
// Defer registering particle systems to ParticleSystemManager until the system ID is properly restored.
system = newInstance(ParticleSystem)( systemTemplate, INVALID_PARTICLE_SYSTEM_ID, FALSE );

if( system == nullptr )
{
// read system data
xfer->xferSnapshot( system );

DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to allocate particle system '%s'",
if( system->getSystemID() == INVALID_PARTICLE_SYSTEM_ID )
{
DEBUG_CRASH(( "ParticleSystemManager::xfer - Unable to restore system ID to particle system '%s'",
systemName.str() ));
deleteInstance(system);
throw SC_INVALID_DATA;

}

// read system data
xfer->xferSnapshot( system );

friend_addParticleSystem(system);
}

}
Expand Down
Loading