aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/groovie/groovie.cpp7
-rw-r--r--engines/groovie/groovie.h11
2 files changed, 2 insertions, 16 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index f08091dac9..8c1fd476f0 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -68,7 +68,7 @@ GroovieEngine::~GroovieEngine() {
delete _graphicsMan;
}
-Common::Error GroovieEngine::init() {
+Common::Error GroovieEngine::run() {
// Initialize the graphics
initGraphics(640, 480, true);
@@ -156,13 +156,8 @@ Common::Error GroovieEngine::init() {
_script.directGameLoad(slot);
}
- return Common::kNoError;
-}
-
-Common::Error GroovieEngine::go() {
// Check that the game files and the audio tracks aren't together run from
// the same cd
-
checkCD();
// Game timer counter
diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h
index 5407d0b174..55f1829822 100644
--- a/engines/groovie/groovie.h
+++ b/engines/groovie/groovie.h
@@ -76,16 +76,7 @@ public:
protected:
// Engine APIs
- Common::Error init();
- Common::Error go();
- virtual Common::Error run() {
- Common::Error err;
- err = init();
- if (err != Common::kNoError)
- return err;
- return go();
- }
-
+ Common::Error run();
virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
virtual bool hasFeature(EngineFeature f) const;