bugfix(weapon): Weapon effects now show again for hidden objects that are not explicitly stealthed (#1918)

Stubbjax · web-flow · commit c060a47b8639 · 2025-11-27T19:56:22.000+01:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -890,6 +890,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		const Bool isVisible = outerDrawable && outerDrawable->isVisible();
 
 		if (!isVisible																				// if user watching cannot see us
+			&& sourceObj->testStatus(OBJECT_STATUS_STEALTHED)		// if unit is stealthed (like a Pathfinder)
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
@@ -921,6 +921,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 		const Bool isVisible = outerDrawable && outerDrawable->isVisible();
 
 		if (!isVisible																				// if user watching cannot see us
+			&& sourceObj->testStatus(OBJECT_STATUS_STEALTHED)		// if unit is stealthed (like a Pathfinder)
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)

Original file line number	Diff line number	Diff line change
`@@ -890,6 +890,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate`
`890`	`890`	`const Bool isVisible = outerDrawable && outerDrawable->isVisible();`
`891`	`891`
`892`	`892`	`if (!isVisible // if user watching cannot see us`
	`893`	`+ && sourceObj->testStatus(OBJECT_STATUS_STEALTHED) // if unit is stealthed (like a Pathfinder)`
`893`	`894`	`&& !sourceObj->isKindOf(KINDOF_MINE) // and not a mine (which always do the FX, even if hidden)...`
`894`	`895`	`&& !isPlayFXWhenStealthed() // and not a weapon marked to playwhenstealthed`
`895`	`896`	`)`
Original file line number	Diff line number	Diff line change
`@@ -921,6 +921,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate`
`921`	`921`	`const Bool isVisible = outerDrawable && outerDrawable->isVisible();`
`922`	`922`
`923`	`923`	`if (!isVisible // if user watching cannot see us`
	`924`	`+ && sourceObj->testStatus(OBJECT_STATUS_STEALTHED) // if unit is stealthed (like a Pathfinder)`
`924`	`925`	`&& !sourceObj->isKindOf(KINDOF_MINE) // and not a mine (which always do the FX, even if hidden)...`
`925`	`926`	`&& !isPlayFXWhenStealthed() // and not a weapon marked to playwhenstealthed`
`926`	`927`	`)`