diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/osd/modules/input/input_win32.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/osd/modules/input/input_win32.cpp')
-rw-r--r-- | src/osd/modules/input/input_win32.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index 0fb86095112..e9cfc734f2e 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -14,17 +14,11 @@ // standard windows headers #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include <winioctl.h> -#include <tchar.h> #undef interface -#include <mutex> - // MAME headers #include "emu.h" #include "osdepend.h" -#include "ui/ui.h" -#include "strconv.h" // MAMEOS headers #include "winmain.h" @@ -101,13 +95,13 @@ public: if (!input_enabled()) return FALSE; - KeyPressEventArgs *args = nullptr; + KeyPressEventArgs *args; switch (eventid) { case INPUT_EVENT_KEYDOWN: case INPUT_EVENT_KEYUP: - args = (KeyPressEventArgs*)eventdata; + args = static_cast<KeyPressEventArgs*>(eventdata); for (int i = 0; i < devicelist()->size(); i++) downcast<win32_keyboard_device*>(devicelist()->at(i))->queue_events(args, 1); @@ -253,7 +247,8 @@ public: win32_lightgun_device(running_machine& machine, const char *name, input_module &module) : event_based_device(machine, name, DEVICE_CLASS_LIGHTGUN, module), m_lightgun_shared_axis_mode(FALSE), - m_gun_index(0) + m_gun_index(0), + mouse({0}) { m_lightgun_shared_axis_mode = downcast<windows_options &>(machine.options()).dual_lightgun(); |