Skip to content

bugfix: Sniper weapons can no longer fire upon empty Stinger Sites #2822

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
Stubbjax wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −0
Open

bugfix: Sniper weapons can no longer fire upon empty Stinger Sites #2822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
290abfd
bugfix: Sniper weapons can no longer fire upon empty Stinger Sites
Stubbjax Jun 22, 2026
84a4ef9
tweak: Cover unspawned states
Stubbjax Jun 22, 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
2 changes: 2 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ class SpawnBehaviorInterface
virtual Bool areAllSlavesStealthed() const = 0;
virtual void revealSlaves() = 0;
virtual Bool doSlavesHaveFreedom() const = 0;
virtual Int getSlaveCount() const = 0;
};

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -177,6 +178,7 @@ class SpawnBehavior : public UpdateModule,
virtual Bool areAllSlavesStealthed() const override;
virtual void revealSlaves() override;
virtual Bool doSlavesHaveFreedom() const override { return getSpawnBehaviorModuleData()->m_slavesHaveFreeWill; }
virtual Int getSlaveCount() const override { return m_spawnCount; }

// **********************************************************************************************
// our own methods
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
#include "GameLogic/Module/AssistedTargetingUpdate.h"
#include "GameLogic/Module/ProjectileStreamUpdate.h"
#include "GameLogic/Module/PhysicsUpdate.h"
#include "GameLogic/Module/SpawnBehavior.h"
#include "GameLogic/TerrainLogic.h"

#define RATIONALIZE_ATTACK_RANGE
Expand Down Expand Up @@ -604,6 +605,15 @@ Real WeaponTemplate::estimateWeaponTemplateDamage(
if ( victimObj->getContain()->getContainCount() == 0 )
return 0.0f;
}
#if !RETAIL_COMPATIBLE_CRC
else
{
// TheSuperHackers @bugfix Stubbjax 22/06/2026 Only allow targeting Stinger Sites when they contain Soldiers.
SpawnBehaviorInterface* spawnInterface = victimObj->getSpawnBehaviorInterface();
if (spawnInterface && spawnInterface->getSlaveCount() <= 0)
return 0.0f;
}
#endif
}


Expand Down
Loading