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/queen | |
| 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/queen')
| -rw-r--r-- | engines/queen/input.cpp | 14 | ||||
| -rw-r--r-- | engines/queen/journal.cpp | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 578aa56e03..2d67e17385 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -91,13 +91,13 @@ void Input::delay(uint amount) { } uint32 end = _system->getMillis() + amount; do { - OSystem::Event event; + Common::Event event; Common::EventManager *eventMan = _system->getEventManager(); while (eventMan->pollEvent(event)) { _idleTime = 0; switch (event.type) { - case OSystem::EVENT_KEYDOWN: - if (event.kbd.flags == OSystem::KBD_CTRL) { + case Common::EVENT_KEYDOWN: + if (event.kbd.flags == Common::KBD_CTRL) { if (event.kbd.keycode == 'd') { _debugger = true; } else if (event.kbd.keycode == 'f') { @@ -108,24 +108,24 @@ void Input::delay(uint amount) { } break; - case OSystem::EVENT_MOUSEMOVE: + case Common::EVENT_MOUSEMOVE: _mouse_x = event.mouse.x; _mouse_y = event.mouse.y; break; - case OSystem::EVENT_LBUTTONDOWN: + case Common::EVENT_LBUTTONDOWN: _mouseButton |= MOUSE_LBUTTON; _mouse_x = event.mouse.x; _mouse_y = event.mouse.y; break; - case OSystem::EVENT_RBUTTONDOWN: + case Common::EVENT_RBUTTONDOWN: _mouseButton |= MOUSE_RBUTTON; _mouse_x = event.mouse.x; _mouse_y = event.mouse.y; break; - case OSystem::EVENT_QUIT: + case Common::EVENT_QUIT: _system->quit(); break; diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index be4b3a45a1..aaaa0cdb42 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -65,23 +65,23 @@ void Journal::use() { _quitMode = QM_LOOP; while (_quitMode == QM_LOOP) { - OSystem::Event event; + Common::Event event; Common::EventManager *eventMan = _system->getEventManager(); while (eventMan->pollEvent(event)) { switch (event.type) { - case OSystem::EVENT_KEYDOWN: + case Common::EVENT_KEYDOWN: handleKeyDown(event.kbd.ascii, event.kbd.keycode); break; - case OSystem::EVENT_LBUTTONDOWN: + case Common::EVENT_LBUTTONDOWN: handleMouseDown(event.mouse.x, event.mouse.y); break; - case OSystem::EVENT_WHEELUP: + case Common::EVENT_WHEELUP: handleMouseWheel(-1); break; - case OSystem::EVENT_WHEELDOWN: + case Common::EVENT_WHEELDOWN: handleMouseWheel(1); break; - case OSystem::EVENT_QUIT: + case Common::EVENT_QUIT: _system->quit(); break; default: |