Skip to content

Commit 82d738b

Browse files
committed
bugfix(input): Force stop camera inputs after match end
1 parent 1a78051 commit 82d738b

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ void InGameUI::setSuperweaponDisplayEnabledByScript(Bool enable)
718718
// ------------------------------------------------------------------------------------------------
719719
Bool InGameUI::getSuperweaponDisplayEnabledByScript(void) const
720720
{
721-
return m_superweaponHiddenByScript;
721+
return !m_superweaponHiddenByScript;
722722
}
723723

724724
// ------------------------------------------------------------------------------------------------
@@ -1988,13 +1988,13 @@ void InGameUI::reset( void )
19881988
m_namedTimers.clear();
19891989
m_namedTimerLastFlashFrame = 0;
19901990
m_namedTimerUsedFlashColor = TRUE; // so next one is false
1991-
m_showNamedTimers = TRUE;
1991+
showNamedTimerDisplay(true);
19921992

19931993
removeMilitarySubtitle();
19941994
clearPopupMessageData();
19951995
m_superweaponLastFlashFrame = 0;
19961996
m_superweaponUsedFlashColor = TRUE; // so next one is false
1997-
m_superweaponHiddenByScript = FALSE;
1997+
setSuperweaponDisplayEnabledByScript(true);
19981998

19991999
clearFloatingText();
20002000
clearWorldAnimations();
@@ -2009,12 +2009,20 @@ void InGameUI::reset( void )
20092009

20102010
}
20112011

2012-
m_waypointMode = false;
2013-
m_forceAttackMode = false;
2014-
m_forceMoveToMode = false;
2015-
m_attackMoveToMode = false;
2016-
m_preferSelection = false;
2017-
m_clientQuiet = false;
2012+
setClientQuiet(false);
2013+
setWaypointMode(false);
2014+
setForceMoveMode(false);
2015+
setForceAttackMode(false);
2016+
setPreferSelectionMode(false);
2017+
clearAttackMoveToMode();
2018+
2019+
setScrolling(false);
2020+
setSelecting(false);
2021+
setCameraRotateLeft(false);
2022+
setCameraRotateRight(false);
2023+
setCameraZoomIn(false);
2024+
setCameraZoomOut(false);
2025+
setCameraTrackingDrawable(false);
20182026

20192027
m_windowLayouts.clear();
20202028

0 commit comments

Comments
 (0)