aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-03-01 09:59:58 +0000
committerWillem Jan Palenstijn2011-11-20 22:43:07 +0100
commitedefa37a45c2ae518847da0cbad6352745e30f5a (patch)
tree3dabe94e3d0c62e111f2d0ac3100d0340f5a712d
parent2156fecf534284323ee205e748eb92543b785eb2 (diff)
downloadscummvm-rg350-edefa37a45c2ae518847da0cbad6352745e30f5a.tar.gz
scummvm-rg350-edefa37a45c2ae518847da0cbad6352745e30f5a.tar.bz2
scummvm-rg350-edefa37a45c2ae518847da0cbad6352745e30f5a.zip
TOLTECS: Fixed compilation
-rw-r--r--engines/toltecs/toltecs.cpp16
-rw-r--r--engines/toltecs/toltecs.h3
2 files changed, 7 insertions, 12 deletions
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index c7ec3cac63..40b23881b7 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -79,15 +79,6 @@ ToltecsEngine::~ToltecsEngine() {
delete _rnd;
}
-Common::Error ToltecsEngine::init() {
- // Initialize backend
- _system->beginGFXTransaction();
- initCommonGFX(true);
- _system->initSize(640, 400);
- _system->endGFXTransaction();
- return Common::kNoError;
-}
-
void ToltecsEngine::syncSoundSettings() {
/*
_music->setVolume(ConfMan.getInt("music_volume"));
@@ -98,7 +89,12 @@ void ToltecsEngine::syncSoundSettings() {
*/
}
-Common::Error ToltecsEngine::go() {
+Common::Error ToltecsEngine::run() {
+ // Initialize backend
+ _system->beginGFXTransaction();
+ initCommonGFX(true);
+ _system->initSize(640, 400);
+ _system->endGFXTransaction();
_isSaveAllowed = true;
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index c3c538ba91..7b7e1a33fc 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -61,8 +61,7 @@ class ToltecsEngine : public ::Engine {
Common::KeyState _keyPressed;
protected:
- Common::Error init();
- Common::Error go();
+ Common::Error run();
// void shutdown();
public: