diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
commit | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch) | |
tree | 5aad5623d352ec0b4aa245856958c61a384861c7 /src/game.h | |
parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
download | manaplus-stripped1.1.11.27.tar.gz manaplus-stripped1.1.11.27.tar.bz2 manaplus-stripped1.1.11.27.tar.xz manaplus-stripped1.1.11.27.zip |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'src/game.h')
-rw-r--r-- | src/game.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/game.h b/src/game.h index 2205e30de..4e5337d29 100644 --- a/src/game.h +++ b/src/game.h @@ -78,6 +78,14 @@ class Game void handleInput(); + bool handleOutfitsKeys(SDL_Event &event, bool &used); + + bool handleSwitchKeys(SDL_Event &event, bool &used); + + void handleMoveAndAttack(SDL_Event &event, bool wasDown); + + void handleActive(SDL_Event &event); + void changeMap(const std::string &mapName); /** |