Browse Source

Remove `DVL_WM_SYSKEYDOWN`, `DVL_WM_SYSKEYCOMMAND`

These events were no longer used
pull/5026/head
Gleb Mazovetskiy 4 years ago
parent
commit
fae441e75f
  1. 21
      Source/diablo.cpp
  2. 9
      Source/miniwin/misc_msg.h

21
Source/diablo.cpp

@ -411,14 +411,6 @@ void RightMouseDown(bool isShiftHeld)
}
}
bool PressSysKey(SDL_Keycode wParam)
{
if (gmenu_is_active() || wParam != SDLK_F10)
return false;
DiabloHotkeyMsg(1);
return true;
}
void ReleaseKey(int vkey)
{
if (sgnTimeoutCurs != CURSOR_NONE || dropGoldFlag)
@ -612,17 +604,6 @@ void GameEventHandler(uint32_t uMsg, uint32_t wParam, uint32_t lParam)
case DVL_WM_KEYUP:
ReleaseKey(static_cast<SDL_Keycode>(wParam));
return;
case DVL_WM_SYSKEYDOWN:
if (PressSysKey(static_cast<SDL_Keycode>(wParam)))
return;
break;
case DVL_WM_SYSCOMMAND:
if (wParam == DVL_SC_CLOSE) {
gbRunGame = false;
gbRunGameResult = false;
return;
}
break;
case DVL_WM_MOUSEMOVE:
GetMousePos(lParam);
gmenu_on_mouse_move();
@ -2035,8 +2016,6 @@ void DisableInputEventHandler(uint32_t uMsg, uint32_t /*wParam*/, uint32_t lPara
switch (uMsg) {
case DVL_WM_KEYDOWN:
case DVL_WM_KEYUP:
case DVL_WM_SYSKEYDOWN:
case DVL_WM_SYSCOMMAND:
return;
case DVL_WM_MOUSEMOVE:
GetMousePos(lParam);

9
Source/miniwin/misc_msg.h

@ -68,11 +68,11 @@ inline uint16_t DecodeMouseModState(uint32_t wParam)
return modState;
}
#define DVL_WM_QUIT 0x0012
//
// Events
//
#define DVL_WM_QUIT 0x0012
#define DVL_WM_MOUSEMOVE 0x0200
#define DVL_WM_LBUTTONDOWN 0x0201
#define DVL_WM_LBUTTONUP 0x0202
@ -87,15 +87,10 @@ inline uint16_t DecodeMouseModState(uint32_t wParam)
#define DVL_WM_KEYDOWN 0x0100
#define DVL_WM_KEYUP 0x0101
#define DVL_WM_SYSKEYDOWN 0x0104
#define DVL_WM_SYSCOMMAND 0x0112
#define DVL_WM_CAPTURECHANGED 0x0215
#define DVL_WM_PAINT 0x000F
#define DVL_WM_QUERYENDSESSION 0x0011
#define DVL_SC_CLOSE 0xF060
} // namespace devilution

Loading…
Cancel
Save