thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Turn _modifierStates into member of class EventManager

Browse source 
svn-id: r49963
This commit is contained in:
Max Horn 2010-06-17 23:12:17 +00:00
parent 06997c0da6
commit 2556ea192c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/sci/event.cpp
View file

@ -36,7 +36,7 @@ namespace Sci {
#define SCANCODE_ROWS_NR 3 #define SCANCODE_ROWS_NR 3
EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended) { EventManager::EventManager(bool fontIsExtended) : _fontIsExtended(fontIsExtended), _modifierStates(0) {
} }
EventManager::~EventManager() { EventManager::~EventManager() {
@ -115,7 +115,6 @@ static const byte codepagemap_88591toDOS[0x80] = {
}; };
SciEvent EventManager::getScummVMEvent() { SciEvent EventManager::getScummVMEvent() {
static int _modifierStates = 0; // FIXME: Avoid non-const global vars
SciEvent input = { SCI_EVENT_NONE, 0, 0, 0 }; SciEvent input = { SCI_EVENT_NONE, 0, 0, 0 };
Common::EventManager *em = g_system->getEventManager(); Common::EventManager *em = g_system->getEventManager();

1
engines/sci/event.h
View file

@ -120,6 +120,7 @@ private:
SciEvent getScummVMEvent(); SciEvent getScummVMEvent();
const bool _fontIsExtended; const bool _fontIsExtended;
int _modifierStates;
Common::List<SciEvent> _events; Common::List<SciEvent> _events;
}; };