aboutsummaryrefslogtreecommitdiff
path: root/backends/events/default
diff options
context:
space:
mode:
authorNicola Mettifogo2007-09-19 08:40:12 +0000
committerNicola Mettifogo2007-09-19 08:40:12 +0000
commit258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch)
treea3ae8675b679c9f3b58ac8d97c79369502ea23c1 /backends/events/default
parenta89694c0d61a75a960f5bec6c498659c988401cc (diff)
downloadscummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2
scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'backends/events/default')
-rw-r--r--backends/events/default/default-events.cpp7
-rw-r--r--backends/events/default/default-events.h1
2 files changed, 3 insertions, 5 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 6bd97c7f71..7730cb7df1 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -25,7 +25,6 @@
#if !defined(DISABLE_DEFAULT_EVENTMANAGER)
-#include "common/stdafx.h"
#include "common/config-manager.h"
#include "common/system.h"
#include "backends/events/default/default-events.h"
@@ -48,9 +47,9 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) :
bool DefaultEventManager::pollEvent(Common::Event &event) {
uint32 time = _boss->getMillis();
bool result;
-
+
result = _boss->pollEvent(event);
-
+
if (result) {
event.synthetic = false;
switch (event.type) {
@@ -124,7 +123,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
result = true;
}
}
-
+
return result;
}
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index 6e8ce6b77c..e7d70cb152 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -26,7 +26,6 @@
#if !defined(BACKEND_EVENTS_DEFAULT_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER)
#define BACKEND_EVENTS_DEFAULT_H
-#include "common/stdafx.h"
#include "common/events.h"
/*