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/control.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/control.cpp')
-rw-r--r-- | engines/sky/control.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 09e7b5a805..3d34ed9e36 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1547,7 +1547,7 @@ void Control::restartGame(void) { void Control::delay(unsigned int amount) { - OSystem::Event event; + Common::Event event; uint32 start = _system->getMillis(); uint32 cur = start; @@ -1557,32 +1557,32 @@ void Control::delay(unsigned int amount) { Common::EventManager *eventMan = _system->getEventManager(); while (eventMan->pollEvent(event)) { switch (event.type) { - case OSystem::EVENT_KEYDOWN: + case Common::EVENT_KEYDOWN: // Make sure backspace works right (this fixes a small issue on OS X) if (event.kbd.keycode == 8) _keyPressed = 8; else _keyPressed = (byte)event.kbd.ascii; break; - case OSystem::EVENT_MOUSEMOVE: + case Common::EVENT_MOUSEMOVE: if (!(SkyEngine::_systemVars.systemFlags & SF_MOUSE_LOCKED)) _skyMouse->mouseMoved(event.mouse.x, event.mouse.y); break; - case OSystem::EVENT_LBUTTONDOWN: + case Common::EVENT_LBUTTONDOWN: _mouseClicked = true; break; - case OSystem::EVENT_LBUTTONUP: + case Common::EVENT_LBUTTONUP: _mouseClicked = false; break; - case OSystem::EVENT_RBUTTONDOWN: + case Common::EVENT_RBUTTONDOWN: break; - case OSystem::EVENT_WHEELUP: + case Common::EVENT_WHEELUP: _mouseWheel = -1; break; - case OSystem::EVENT_WHEELDOWN: + case Common::EVENT_WHEELDOWN: _mouseWheel = 1; break; - case OSystem::EVENT_QUIT: + case Common::EVENT_QUIT: SkyEngine::_systemVars.quitGame = true; break; default: |