Skip to content

tweak(radar): Suppress under attack radar notification spam #2540

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
Apr 6, 2026
+8 −1
Merged

tweak(radar): Suppress under attack radar notification spam #2540

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2b4539
Fix notification spam by restoring the retail map-wide suppression.
githubawn Apr 5, 2026
4956f6a
added PRESERVE_RETAIL_BEHAVIOR
githubawn Apr 6, 2026
3d8a0fc
fix vc6 compile warning
githubawn Apr 6, 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
9 changes: 8 additions & 1 deletion Core/GameEngine/Source/Common/System/Radar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,14 @@
// get distance from our new event location to this event location in 2D
const Real distSquared = sqr(m_event[ i ].worldLoc.x - pos->x) + sqr(m_event[ i ].worldLoc.y - pos->y);

if( distSquared <= closeEnoughDistanceSq )
Bool isClose = distSquared <= closeEnoughDistanceSq;
#if PRESERVE_RETAIL_BEHAVIOR
// TheSuperHackers @tweak Preserve retail map-wide suppression for under attack events
// because otherwise they trigger way too frequent from cargo planes.
isClose |= event == RADAR_EVENT_UNDER_ATTACK;

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence

Check warning on line 1195 in Core/GameEngine/Source/Common/System/Radar.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e 

 '|' : check operator precedence for possible error; use parentheses to clarify precedence
Comment thread
githubawn marked this conversation as resolved.
Outdated
#endif

if( isClose )
{

// finally only reject making a new event of this existing one is "recent enough"
Comment thread
githubawn marked this conversation as resolved.
Expand Down
Loading