Skip to content

bugfix(weapon): Show weapon effects of stealthed objects for allies and observers #1865

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 3 commits into from
Nov 16, 2025
Merged

bugfix(weapon): Show weapon effects of stealthed objects for allies and observers #1865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a520007
bugfix: Show weapon effects of stealthed objects for allies and obser…
Stubbjax Nov 16, 2025
fc9121f
docs: Add reminder for a future refactor
Stubbjax Nov 16, 2025
2c60704
docs: Update comments
Stubbjax Nov 16, 2025
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
6 changes: 3 additions & 3 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,9 +884,9 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate

Bool handled;

if(!sourceObj->isLocallyControlled() // if user watching is not controller and
&& sourceObj->testStatus(OBJECT_STATUS_STEALTHED) // if unit is stealthed (like a Pathfinder)
&& !sourceObj->testStatus(OBJECT_STATUS_DETECTED) // but not detected...
// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.

if(!sourceObj->getDrawable()->isVisible() // if user watching cannot see us
&& !sourceObj->isKindOf(KINDOF_MINE) // and not a mine (which always do the FX, even if hidden)...
&& !isPlayFXWhenStealthed() // and not a weapon marked to playwhenstealthed
)
Expand Down
7 changes: 3 additions & 4 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 @@ -915,10 +915,9 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate

Bool handled;

if(!sourceObj->isLocallyControlled() // if user watching is not controller and
&& sourceObj->testStatus(OBJECT_STATUS_STEALTHED) // if unit is stealthed (like a Pathfinder)
&& !sourceObj->testStatus(OBJECT_STATUS_DETECTED) // but not detected...
&& !sourceObj->testStatus(OBJECT_STATUS_DISGUISED) // and not disguised...
// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.

if(!sourceObj->getDrawable()->isVisible() // if user watching cannot see us
&& !sourceObj->isKindOf(KINDOF_MINE) // and not a mine (which always do the FX, even if hidden)...
&& !isPlayFXWhenStealthed() // and not a weapon marked to playwhenstealthed
)
Expand Down
Loading