diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-03 21:29:52 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-03 21:29:52 -0500 |
commit | 138e0a8f83e82c6109bfc387ac7417d4f41711b4 (patch) | |
tree | af4fe2d5453d5d2090f8106a433d507bd0e75a81 /src/input_system.cpp | |
parent | dab96b810691c26e29fef92d88c828a311be3e9d (diff) | |
download | tanetane-138e0a8f83e82c6109bfc387ac7417d4f41711b4.tar.gz tanetane-138e0a8f83e82c6109bfc387ac7417d4f41711b4.tar.bz2 tanetane-138e0a8f83e82c6109bfc387ac7417d4f41711b4.zip |
Added cutscene bars (and resized game)
Diffstat (limited to 'src/input_system.cpp')
-rw-r--r-- | src/input_system.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/input_system.cpp b/src/input_system.cpp index 54a291c..7bd605c 100644 --- a/src/input_system.cpp +++ b/src/input_system.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "input_system.h" | 1 | #include "input_system.h" |
2 | #include "game.h" | 2 | #include "game.h" |
3 | #include "character_system.h" | 3 | #include "character_system.h" |
4 | #include "message_system.h" | ||
4 | 5 | ||
5 | struct Input { | 6 | struct Input { |
6 | bool left = false; | 7 | bool left = false; |
@@ -16,11 +17,20 @@ void InputSystem::tick(double dt) { | |||
16 | game_.quit(); | 17 | game_.quit(); |
17 | 18 | ||
18 | return; | 19 | return; |
19 | } else if (e.type == SDL_KEYDOWN && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) { | 20 | } else if (e.type == SDL_KEYDOWN) { |
20 | for (int spriteId : game_.getSprites()) { | 21 | if (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT) { |
21 | Sprite& sprite = game_.getSprite(spriteId); | 22 | for (int spriteId : game_.getSprites()) { |
22 | if (sprite.controllable) { | 23 | Sprite& sprite = game_.getSprite(spriteId); |
23 | game_.getSystem<CharacterSystem>().beginCrouch(spriteId); | 24 | if (sprite.controllable) { |
25 | game_.getSystem<CharacterSystem>().beginCrouch(spriteId); | ||
26 | } | ||
27 | } | ||
28 | } else if (e.key.keysym.sym == SDLK_a) { | ||
29 | // TODO: Remove this, it's just for testing. | ||
30 | if (game_.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0) { | ||
31 | game_.getSystem<MessageSystem>().hideCutsceneBars(); | ||
32 | } else { | ||
33 | game_.getSystem<MessageSystem>().displayCutsceneBars(); | ||
24 | } | 34 | } |
25 | } | 35 | } |
26 | } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) { | 36 | } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) { |