diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp index 45de30cb5c3..b93f7bddec1 100644 --- a/engines/sci/event.cpp +++ b/engines/sci/event.cpp @@ -36,7 +36,7 @@ namespace Sci { #define SCANCODE_ROWS_NR 3 -EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended) { +EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended), _modifierStates(0) { } EventManager::~EventManager() { @@ -115,7 +115,6 @@ static const byte codepagemap_88591toDOS[0x80] = { }; SciEvent EventManager::getScummVMEvent() { - static int _modifierStates = 0; // FIXME: Avoid non-const global vars SciEvent input = { SCI_EVENT_NONE, 0, 0, 0 }; Common::EventManager *em = g_system->getEventManager(); diff --git a/engines/sci/event.h b/engines/sci/event.h index dc7aebc98e2..314add7b2ca 100644 --- a/engines/sci/event.h +++ b/engines/sci/event.h @@ -120,6 +120,7 @@ private: SciEvent getScummVMEvent(); const bool _fontIsExtended; + int _modifierStates; Common::List _events; };