From 826b3dfe5c288d26be10e6aee07c0175f4e2fa1f Mon Sep 17 00:00:00 2001 From: onpon4 Date: Sun, 29 Mar 2015 16:49:33 -0400 Subject: [PATCH] Fixed controls being stuck, but still on, at the end of Venus. Now the controls are cleared, so the intended effect always happens. --- src/game.cpp | 6 ++++++ src/player.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 8e2238a..e6c54fc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -546,6 +546,12 @@ int mainGameLoop() else if ((currentGame.area == MISN_VENUS) && (engine.musicVolume > 0)) { + engine.keyState[KEY_UP] = 0; + engine.keyState[KEY_DOWN] = 0; + engine.keyState[KEY_LEFT] = 0; + engine.keyState[KEY_RIGHT] = 0; + engine.keyState[KEY_FIRE] = 0; + engine.keyState[KEY_ALTFIRE] = 0; LIMIT_ADD(engine.musicVolume, -0.2, 0, 100); audio_setMusicVolume((int)engine.musicVolume); } diff --git a/src/player.cpp b/src/player.cpp index 0dc7ef8..5304cbe 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -550,8 +550,12 @@ void getPlayerInput() void leaveSector() { - engine.keyState[KEY_UP] = engine.keyState[KEY_DOWN] = engine.keyState[KEY_LEFT] = engine.keyState[KEY_RIGHT] = 0; - engine.keyState[KEY_FIRE] = engine.keyState[KEY_ALTFIRE] = 0; + engine.keyState[KEY_UP] = 0; + engine.keyState[KEY_DOWN] = 0; + engine.keyState[KEY_LEFT] = 0; + engine.keyState[KEY_RIGHT] = 0; + engine.keyState[KEY_FIRE] = 0; + engine.keyState[KEY_ALTFIRE] = 0; if (engine.done == 0) engine.done = 3;