Skip to content

Commit be748f9

Browse files
committed
unify(mouse): Merge Mouse, Keyboard code (TheSuperHackers#2334)
1 parent f3790f2 commit be748f9

3 files changed

Lines changed: 0 additions & 5 deletions

File tree

Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,6 @@ Bool Keyboard::checkKeyRepeat( void )
227227

228228
const UnsignedInt now = timeGetTime();
229229
const UnsignedInt keyDownTime = m_keyStatus[ key ].keyDownTimeMsec;
230-
231-
// Unsigned subtraction handles wraparound correctly
232230
const UnsignedInt elapsedMsec = now - keyDownTime;
233231

234232
if( elapsedMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )

Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ void DirectInputMouse::openMouse( void )
6363

6464
// create a device for the system mouse
6565
hr = m_pDirectInput->CreateDevice( GUID_SysMouse, &m_pMouseDevice, nullptr );
66-
&m_pMouseDevice,
67-
nullptr );
6866
if( FAILED( hr ) )
6967
{
7068

GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ class Mouse : public SubsystemInterface
323323

324324
Bool isClick(const ICoord2D *anchor, const ICoord2D *dest, UnsignedInt previousMouseClick, UnsignedInt currentMouseClick);
325325

326-
327326
AsciiString m_tooltipFontName; ///< tooltip font
328327
Int m_tooltipFontSize; ///< tooltip font
329328
Bool m_tooltipFontIsBold; ///< tooltip font

0 commit comments

Comments
 (0)