diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/client/inputhandler.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/client/inputhandler.h')
| -rw-r--r-- | src/client/inputhandler.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h index e006affb2..ef5f6fb32 100644 --- a/src/client/inputhandler.h +++ b/src/client/inputhandler.h @@ -218,10 +218,7 @@ public: virtual ~InputHandler() = default; - virtual bool isRandom() const - { - return false; - } + virtual bool isRandom() const { return false; } virtual bool isKeyDown(GameKeyType k) = 0; virtual void setKeypress(const KeyPress &keyCode) = 0; @@ -377,7 +374,7 @@ public: m_receiver->clearInput(); } - private: +private: MyEventReceiver *m_receiver = nullptr; v2s32 m_mousepos; }; @@ -387,20 +384,11 @@ class RandomInputHandler : public InputHandler public: RandomInputHandler() = default; - bool isRandom() const - { - return true; - } + bool isRandom() const { return true; } virtual bool isKeyDown(GameKeyType k) { return keydown[keycache.key[k]]; } - virtual void setKeypress(const KeyPress &keyCode) - { - keydown.set(keyCode); - } - virtual void unsetKeypress(const KeyPress &keyCode) - { - keydown.unset(keyCode); - } + virtual void setKeypress(const KeyPress &keyCode) { keydown.set(keyCode); } + virtual void unsetKeypress(const KeyPress &keyCode) { keydown.unset(keyCode); } virtual bool wasKeyDown(GameKeyType k) { return false; } virtual bool cancelPressed() { return false; } virtual v2s32 getMousePos() { return mousepos; } |