aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/intro.cpp
diff options
context:
space:
mode:
authorMax Horn2007-03-17 19:02:05 +0000
committerMax Horn2007-03-17 19:02:05 +0000
commited54ea9155961d8ca5d5fb3c7777fc57a29f2751 (patch)
tree467b926af11cd4129ba003d04ba01de044c7a6df /engines/sky/intro.cpp
parentf272d1957084098c5b53975ad3501074f6971af8 (diff)
downloadscummvm-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/intro.cpp')
-rw-r--r--engines/sky/intro.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 9528be1905..14613d0ff5 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -900,7 +900,7 @@ void Intro::restoreScreen(void) {
bool Intro::escDelay(uint32 msecs) {
Common::EventManager *eventMan = _system->getEventManager();
- OSystem::Event event;
+ Common::Event event;
if (_relDelay == 0) // first call, init with system time
_relDelay = (int32)_system->getMillis();
@@ -909,10 +909,10 @@ bool Intro::escDelay(uint32 msecs) {
int32 nDelay = 0;
do {
while (eventMan->pollEvent(event)) {
- if (event.type == OSystem::EVENT_KEYDOWN) {
+ if (event.type == Common::EVENT_KEYDOWN) {
if (event.kbd.keycode == 27)
return false;
- } else if (event.type == OSystem::EVENT_QUIT) {
+ } else if (event.type == Common::EVENT_QUIT) {
_quitProg = true;
return false;
}