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/sword1/sword1.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/sword1/sword1.cpp')
| -rw-r--r-- | engines/sword1/sword1.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index d9c689a769..7a783c63b3 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -702,45 +702,45 @@ uint8 SwordEngine::mainLoop(void) { void SwordEngine::delay(int32 amount) { //copied and mutilated from sky.cpp - OSystem::Event event; + Common::Event event; uint32 start = _system->getMillis(); do { 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 = (uint8)event.kbd.ascii; break; - case OSystem::EVENT_MOUSEMOVE: + case Common::EVENT_MOUSEMOVE: _mouseX = event.mouse.x; _mouseY = event.mouse.y; break; - case OSystem::EVENT_LBUTTONDOWN: + case Common::EVENT_LBUTTONDOWN: _mouseState |= BS1L_BUTTON_DOWN; #if defined(_WIN32_WCE) || defined(PALMOS_MODE) _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif break; - case OSystem::EVENT_RBUTTONDOWN: + case Common::EVENT_RBUTTONDOWN: _mouseState |= BS1R_BUTTON_DOWN; #if defined(_WIN32_WCE) || defined(PALMOS_MODE) _mouseX = event.mouse.x; _mouseY = event.mouse.y; #endif break; - case OSystem::EVENT_LBUTTONUP: + case Common::EVENT_LBUTTONUP: _mouseState |= BS1L_BUTTON_UP; break; - case OSystem::EVENT_RBUTTONUP: + case Common::EVENT_RBUTTONUP: _mouseState |= BS1R_BUTTON_UP; break; - case OSystem::EVENT_QUIT: + case Common::EVENT_QUIT: _systemVars.engineQuit = true; break; default: |