diff options
| author | Max Horn | 2007-03-17 19:02:05 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-17 19:02:05 +0000 |
| commit | ed54ea9155961d8ca5d5fb3c7777fc57a29f2751 (patch) | |
| tree | 467b926af11cd4129ba003d04ba01de044c7a6df /engines/sky/sky.cpp | |
| parent | f272d1957084098c5b53975ad3501074f6971af8 (diff) | |
| download | scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.tar.gz scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.tar.bz2 scummvm-rg350-ed54ea9155961d8ca5d5fb3c7777fc57a29f2751.zip | |
Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
Diffstat (limited to 'engines/sky/sky.cpp')
| -rw-r--r-- | engines/sky/sky.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 8b12043f76..7cf1566f35 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -222,7 +222,7 @@ void SkyEngine::handleKey(void) { return; } - if (_keyFlags == OSystem::KBD_CTRL) { + if (_keyFlags == Common::KBD_CTRL) { if (_keyPressed == 'f') _fastMode ^= 1; else if (_keyPressed == 'g') @@ -512,7 +512,7 @@ void SkyEngine::gotTimerTick(void) { void SkyEngine::delay(int32 amount) { Common::EventManager *eventMan = _system->getEventManager(); - OSystem::Event event; + Common::Event event; uint32 start = _system->getMillis(); _keyFlags = _keyPressed = 0; //reset @@ -523,28 +523,28 @@ void SkyEngine::delay(int32 amount) { do { while (eventMan->pollEvent(event)) { switch (event.type) { - case OSystem::EVENT_KEYDOWN: + case Common::EVENT_KEYDOWN: _keyFlags = event.kbd.flags; - if (_keyFlags == OSystem::KBD_CTRL) + if (_keyFlags == Common::KBD_CTRL) _keyPressed = event.kbd.keycode; else _keyPressed = (byte)event.kbd.ascii; break; - case OSystem::EVENT_MOUSEMOVE: + case Common::EVENT_MOUSEMOVE: if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); break; - case OSystem::EVENT_LBUTTONDOWN: + case Common::EVENT_LBUTTONDOWN: if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); _skyMouse->buttonPressed(2); break; - case OSystem::EVENT_RBUTTONDOWN: + case Common::EVENT_RBUTTONDOWN: if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); _skyMouse->buttonPressed(1); break; - case OSystem::EVENT_QUIT: + case Common::EVENT_QUIT: _systemVars.quitGame = true; break; default: |