From 138e0a8f83e82c6109bfc387ac7417d4f41711b4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Wed, 3 Feb 2021 21:29:52 -0500 Subject: Added cutscene bars (and resized game) --- src/input_system.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/input_system.cpp') 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 @@ #include "input_system.h" #include "game.h" #include "character_system.h" +#include "message_system.h" struct Input { bool left = false; @@ -16,11 +17,20 @@ void InputSystem::tick(double dt) { game_.quit(); return; - } else if (e.type == SDL_KEYDOWN && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) { - for (int spriteId : game_.getSprites()) { - Sprite& sprite = game_.getSprite(spriteId); - if (sprite.controllable) { - game_.getSystem().beginCrouch(spriteId); + } else if (e.type == SDL_KEYDOWN) { + if (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT) { + for (int spriteId : game_.getSprites()) { + Sprite& sprite = game_.getSprite(spriteId); + if (sprite.controllable) { + game_.getSystem().beginCrouch(spriteId); + } + } + } else if (e.key.keysym.sym == SDLK_a) { + // TODO: Remove this, it's just for testing. + if (game_.getSystem().getCutsceneBarsProgress() == 1.0) { + game_.getSystem().hideCutsceneBars(); + } else { + game_.getSystem().displayCutsceneBars(); } } } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) { -- cgit 1.4.1