summaryrefslogtreecommitdiff
path: root/lib/nes/app/input/input-device.hh
diff options
context:
space:
mode:
Diffstat (limited to 'lib/nes/app/input/input-device.hh')
-rw-r--r--lib/nes/app/input/input-device.hh24
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/nes/app/input/input-device.hh b/lib/nes/app/input/input-device.hh
index 9ac7423..8e54f61 100644
--- a/lib/nes/app/input/input-device.hh
+++ b/lib/nes/app/input/input-device.hh
@@ -2,7 +2,7 @@
#include "nes/sys/types/button-mask.hh"
-namespace nes
+namespace nes::app
{
/// An abstract input device which can be used to play games.
class input_device
@@ -24,21 +24,21 @@ namespace nes
virtual auto read_key_select() -> bool = 0;
virtual auto read_key_start() -> bool = 0;
- auto read_mask() -> button_mask
+ auto read_mask() -> sys::button_mask
{
- auto res = button_mask{};
- if (read_key_up()) { res.add(buttons::up); }
- if (read_key_down()) { res.add(buttons::down); }
- if (read_key_left()) { res.add(buttons::left); }
- if (read_key_right()) { res.add(buttons::right); }
- if (read_key_a()) { res.add(buttons::a); }
- if (read_key_b()) { res.add(buttons::b); }
- if (read_key_select()) { res.add(buttons::select); }
- if (read_key_start()) { res.add(buttons::start); }
+ auto res = sys::button_mask{};
+ if (read_key_up()) { res.add(sys::buttons::up); }
+ if (read_key_down()) { res.add(sys::buttons::down); }
+ if (read_key_left()) { res.add(sys::buttons::left); }
+ if (read_key_right()) { res.add(sys::buttons::right); }
+ if (read_key_a()) { res.add(sys::buttons::a); }
+ if (read_key_b()) { res.add(sys::buttons::b); }
+ if (read_key_select()) { res.add(sys::buttons::select); }
+ if (read_key_start()) { res.add(sys::buttons::start); }
return res;
}
protected:
explicit input_device() = default;
};
-} // namespace nes \ No newline at end of file
+} // namespace nes::app \ No newline at end of file