diff options
| author | 2016-04-25 20:09:51 -0400 | |
|---|---|---|
| committer | 2016-04-25 20:09:51 -0400 | |
| commit | 596678f2cd1b40c456db8f278a7f652c2a37da84 (patch) | |
| tree | a4ffbdf51889f7a63ea7dc3da3afee4535987030 /src/emu/input.cpp | |
| parent | ec2669cacff2ec954ba351e09ba083c4e32b4ce4 (diff) | |
| parent | e8326cdc3267591b635f4f97e5255e031ba6b834 (diff) | |
Merge remote-tracking branch 'upstream/master' into firstrun
Diffstat (limited to 'src/emu/input.cpp')
| -rw-r--r-- | src/emu/input.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/input.cpp b/src/emu/input.cpp index 68e825402b4..360810a3b6c 100644 --- a/src/emu/input.cpp +++ b/src/emu/input.cpp @@ -1184,7 +1184,7 @@ void input_manager::reset_polling() for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { - // fetch the device; ignore if NULL + // fetch the device; ignore if nullptr input_device *device = m_class[devclass]->device(devnum); if (device == nullptr) continue; @@ -1211,7 +1211,7 @@ input_code input_manager::poll_switches() for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { - // fetch the device; ignore if NULL + // fetch the device; ignore if nullptr input_device *device = m_class[devclass]->device(devnum); if (device == nullptr) continue; @@ -1291,7 +1291,7 @@ input_code input_manager::poll_keyboard_switches() // iterate over devices within each class for (int devnum = 0; devnum < m_keyboard_class.maxindex(); devnum++) { - // fetch the device; ignore if NULL + // fetch the device; ignore if nullptr input_device *device = m_keyboard_class.device(devnum); if (device == nullptr) continue; @@ -1365,7 +1365,7 @@ input_code input_manager::poll_axes() for (input_device_class devclass = DEVICE_CLASS_FIRST_VALID; devclass <= DEVICE_CLASS_LAST_VALID; ++devclass) for (int devnum = 0; devnum <= m_class[devclass]->maxindex(); devnum++) { - // fetch the device; ignore if NULL + // fetch the device; ignore if nullptr input_device *device = m_class[devclass]->device(devnum); if (device == nullptr) continue; @@ -1400,7 +1400,7 @@ input_device *input_manager::device_from_code(input_code code) const if (devclass >= DEVICE_CLASS_FIRST_VALID && devclass <= DEVICE_CLASS_LAST_VALID) return m_class[devclass]->device(code.device_index()); - // otherwise, return NULL + // otherwise, return nullptr return nullptr; } |
