aboutsummaryrefslogtreecommitdiff
path: root/engines/wage
diff options
context:
space:
mode:
authorEugene Sandulenko2015-12-15 11:12:44 +0100
committerEugene Sandulenko2015-12-27 15:39:52 +0100
commit076a66786299180ff31b2da48d56544757a19ac1 (patch)
treee8db1401ff79c75d44029e5e398a1f3d726527d8 /engines/wage
parente42540a23458887bb61e71be4abc4a0ba435248a (diff)
downloadscummvm-rg350-076a66786299180ff31b2da48d56544757a19ac1.tar.gz
scummvm-rg350-076a66786299180ff31b2da48d56544757a19ac1.tar.bz2
scummvm-rg350-076a66786299180ff31b2da48d56544757a19ac1.zip
WAGE: Sync with mainline
Diffstat (limited to 'engines/wage')
-rw-r--r--engines/wage/detection.cpp2
-rw-r--r--engines/wage/wage.cpp24
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index e54bd2db0b..f8297c2bd2 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -51,7 +51,7 @@ static const ADGameDescription gameDescriptions[] = {
"v1.8",
AD_ENTRY1s("Another Fine Mess 1.8", "8e5aa915f3253efb2aab52435647b25e", 1456000),
Common::EN_ANY,
- Common::kPlatformPC,
+ Common::kPlatformMacintosh,
ADGF_NO_FLAGS,
GUIO0()
},
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 98b437e8a3..d47d284b54 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -46,45 +46,45 @@
*/
#include "common/scummsys.h"
-
+
#include "common/config-manager.h"
#include "common/debug-channels.h"
#include "common/error.h"
-#include "common/EventRecorder.h"
#include "common/file.h"
#include "common/fs.h"
#include "engines/util.h"
+#include "gui/EventRecorder.h"
#include "wage/wage.h"
#include "wage/entities.h"
#include "wage/world.h"
-
+
namespace Wage {
-
+
WageEngine::WageEngine(OSystem *syst, const ADGameDescription *desc) : Engine(syst), _gameDescription(desc) {
_rnd = new Common::RandomSource("wage");
_aim = -1;
-
+
debug("WageEngine::WageEngine()");
}
-
+
WageEngine::~WageEngine() {
debug("WageEngine::~WageEngine()");
-
+
DebugMan.clearAllDebugChannels();
delete _rnd;
}
-
+
Common::Error WageEngine::run() {
initGraphics(320, 200, false);
-
+
// Create debugger console. It requires GFX to be initialized
_console = new Console(this);
-
+
debug("WageEngine::init");
-
+
// Your main event loop should be (invoked from) here.
_resManager = new Common::MacResManager();
_resManager->open(getGameFile());
@@ -93,7 +93,7 @@ Common::Error WageEngine::run() {
if (!_world->loadWorld(_resManager))
return Common::kNoGameDataFoundError;
-
+
return Common::kNoError;
}