Skip to content

Commit ca3d6e6

Browse files
authored
bugfix(input): Prevent command execution when attempting to exit command context while moving the camera (TheSuperHackers#1501)
1 parent 80fd11a commit ca3d6e6

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -917,16 +917,8 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
917917
ICoord2D pixel = msg->getArgument( 0 )->pixel;
918918
UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
919919

920-
Bool isClick = TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime);
921-
922-
if (isClick &&
923-
cameraPos.length() > TheMouse->m_dragTolerance3D)
924-
{
925-
isClick = FALSE;
926-
}
927-
928920
// right click behavior (not right drag)
929-
if (isClick)
921+
if (TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime))
930922
{
931923
//Added support to cancel the GUI command without deselecting the unit(s) involved
932924
//when you right click.

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -993,16 +993,8 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
993993
ICoord2D pixel = msg->getArgument( 0 )->pixel;
994994
UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
995995

996-
Bool isClick = TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime);
997-
998-
if (isClick &&
999-
cameraPos.length() > TheMouse->m_dragTolerance3D)
1000-
{
1001-
isClick = FALSE;
1002-
}
1003-
1004996
// right click behavior (not right drag)
1005-
if (isClick)
997+
if (TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime))
1006998
{
1007999
//Added support to cancel the GUI command without deselecting the unit(s) involved
10081000
//when you right click.

0 commit comments

Comments
 (0)