Skip to content

bugfix(client): Stop camera tracking units outside visibility #3191

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

Draft
OmarAglan wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −3
Draft

bugfix(client): Stop camera tracking units outside visibility #3191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,13 +568,27 @@ void GameClient::update()

if (TheInGameUI->isCameraTrackingDrawable())
{
// TheSuperHackers @bugfix Omar Aglan 12/08/2026 Stop tracking a selected drawable
// as soon as it is no longer visible.
Drawable *draw = TheInGameUI->getFirstSelectedDrawable();
if ( draw )
Object *object = draw ? draw->getObject() : nullptr;
Bool isVisible = object && !draw->isDrawableEffectivelyHidden();

#if ENABLE_CONFIGURABLE_SHROUD
if (isVisible && TheGlobalData->m_shroudOn)
#else
if (isVisible)
#endif
{
TheTacticalView->userLookAt( draw->getPosition() );
const Int playerIndex = rts::getObservedOrLocalPlayer()->getPlayerIndex();
const ObjectShroudStatus shroudStatus = object->getShroudedStatus(playerIndex);
isVisible = shroudStatus == OBJECTSHROUD_CLEAR || shroudStatus == OBJECTSHROUD_PARTIAL_CLEAR;
}

if (isVisible)
TheTacticalView->userLookAt(draw->getPosition());
else
TheInGameUI->setCameraTrackingDrawable( FALSE );
TheInGameUI->setCameraTrackingDrawable(FALSE);
}

if (m_intro != nullptr)
Expand Down