Skip to content

Commit 35b39ef

Browse files
committed
refactor: Merge declarations and assignments
1 parent 557f81e commit 35b39ef

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -910,15 +910,12 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
910910
//-----------------------------------------------------------------------------
911911
case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
912912
{
913-
ICoord2D pixel;
914-
UnsignedInt currentTime;
915913
Coord3D cameraPos;
916-
917914
TheTacticalView->getPosition(&cameraPos);
918915
cameraPos.sub(&m_deselectDownCameraPosition);
919916

920-
pixel = msg->getArgument( 0 )->pixel;
921-
currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
917+
ICoord2D pixel = msg->getArgument( 0 )->pixel;
918+
UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
922919

923920
Bool isClick = TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime);
924921

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -986,15 +986,12 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
986986
//-----------------------------------------------------------------------------
987987
case GameMessage::MSG_RAW_MOUSE_RIGHT_BUTTON_UP:
988988
{
989-
ICoord2D pixel;
990-
UnsignedInt currentTime;
991989
Coord3D cameraPos;
992-
993990
TheTacticalView->getPosition(&cameraPos);
994991
cameraPos.sub(&m_deselectDownCameraPosition);
995992

996-
pixel = msg->getArgument( 0 )->pixel;
997-
currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
993+
ICoord2D pixel = msg->getArgument( 0 )->pixel;
994+
UnsignedInt currentTime = (UnsignedInt) msg->getArgument( 2 )->integer;
998995

999996
Bool isClick = TheMouse->isClick(&m_deselectFeedbackAnchor, &pixel, m_lastClick, currentTime);
1000997

0 commit comments

Comments
 (0)