Skip to content

fix(spectregunship): Decouple particle system in SpectreGunshipUpdate::update from logic crc #3055

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 2 commits into from
Aug 5, 2026
+6 −1
Merged

fix(spectregunship): Decouple particle system in SpectreGunshipUpdate::update from logic crc #3055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9eaaeb
fix(spectregunship): Decouple gattling targeting logic from particle crc
Okladnoj Aug 5, 2026
cd56425
refactor(spectregunship): Confine particle template to retail crc branch
Okladnoj Aug 5, 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
7 changes: 6 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,13 @@ UpdateSleepTime SpectreGunshipUpdate::update()


// GATTLING TARGETING LOGIC------------------------------------------
#if RETAIL_COMPATIBLE_CRC
// TheSuperHackers @fix The particle system is now decoupled from the logic crc
const ParticleSystemTemplate *tmp = data->m_gattlingStrafeFXParticleSystem;
if (tmp && gattling && gattling->testStatus( OBJECT_STATUS_IS_FIRING_WEAPON) )
#else
if (gattling && gattling->testStatus( OBJECT_STATUS_IS_FIRING_WEAPON) )
#endif
{


Expand Down Expand Up @@ -649,7 +654,7 @@ UpdateSleepTime SpectreGunshipUpdate::update()
{

// This makes the client smoke effects of the gattling cannon strafing the ground toward the attack position
ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(tmp);
ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(data->m_gattlingStrafeFXParticleSystem);
if (sys)
{
Coord3D impactPosition;
Expand Down
Loading