better handling of nested state changes

[l2e.git] / src / app / Input.h

diff --git a/src/app/Input.h b/src/app/Input.h
index ad5086920ac954119cb57ced60041d2fba956c75..415d11f0890ade422591d14753570f230b4bba05 100644 (file)
--- a/src/app/Input.h
+++ b/src/app/Input.h
@@ -17,31 +17,36 @@ class Input {
 
 public:
        enum Button {
-               PAD_UP = 1,
-               PAD_RIGHT = 2,
-               PAD_DOWN = 4,
-               PAD_LEFT = 8,
-               ACTION_A = 16,
-               ACTION_B = 32,
-               ACTION_X = 64,
-               ACTION_Y = 128,
-               START = 256,
-               SELECT = 512,
-               SHOULDER_RIGHT = 1024,
-               SHOULDER_LEFT = 2048
+               PAD_UP = 0x0001,
+               PAD_RIGHT = 0x0002,
+               PAD_DOWN = 0x0004,
+               PAD_LEFT = 0x0008,
+               ACTION_A = 0x0010,
+               ACTION_B = 0x0020,
+               ACTION_X = 0x0040,
+               ACTION_Y = 0x0080,
+               START = 0x0100,
+               SELECT = 0x0200,
+               SHOULDER_RIGHT = 0x0400,
+               SHOULDER_LEFT = 0x0800,
+
+               DEBUG_1 = 0x1000,
+               DEBUG_2 = 0x2000,
+               DEBUG_3 = 0x4000,
+               DEBUG_4 = 0x8000,
        };
 
 public:
        Input();
 
 public:
-       bool IsDown(Button b) const {
+       bool IsDown(int b) const {
                return down & b;
        }
-       bool JustPressed(Button b) const {
+       bool JustPressed(int b) const {
                return pressed & b;
        }
-       bool JustReleased(Button b) const {
+       bool JustReleased(int b) const {
                return released & b;
        }