summaryrefslogtreecommitdiff
path: root/src/FLD.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/FLD.hpp')
-rw-r--r--src/FLD.hpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/FLD.hpp b/src/FLD.hpp
index ecc88a8..9d4e879 100644
--- a/src/FLD.hpp
+++ b/src/FLD.hpp
@@ -21,9 +21,6 @@ public:
Release,
Press
};
- using InputStateArray = std::array<InputState, SDL_NUM_SCANCODES>;
- using MouseStateArray = std::array<InputState, 256>;
- using JoyStateArray = std::array<InputState, SDL_CONTROLLER_BUTTON_MAX>;
struct Config {
int width = 640;
int height = 480;
@@ -96,9 +93,6 @@ public:
READONLY(SDL_Texture *, target, nullptr);
READONLY(unsigned long, tick, 0);
READONLY(Color, drawColor, Color({0, 0, 0, 1}));
- READONLY(InputStateArray, keystates, {});
- READONLY(MouseStateArray, mousestates, {});
- READONLY(JoyStateArray, joystates, {});
public:
FLD(const Config& config);
FLD(const Config&& config);
@@ -148,6 +142,9 @@ private:
int off_y = 0;
} transform;
std::map<const std::string, Image> images = {};
+ std::array<InputState, SDL_NUM_SCANCODES> keystates = {};
+ std::array<InputState, 256> mousestates = {};
+ std::array<InputState, SDL_CONTROLLER_BUTTON_MAX> joystates = {};
Error sdlError(const std::string& msg="") const;
Error soloudError(SoLoud::result result) const;