[Scummvm-cvs-logs] SF.net SVN: scummvm:[39023] scummvm/trunk/engines/groovie

[jvprat at users.sourceforge.net]

Revision: 39023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39023&view=rev
Author:   jvprat
Date:     2009-03-01 09:12:32 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
Groovie: Merged init() and go() into run()

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/groovie.cpp
    scummvm/trunk/engines/groovie/groovie.h

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2009-03-01 09:05:48 UTC (rev 39022)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2009-03-01 09:12:32 UTC (rev 39023)
@@ -68,7 +68,7 @@
 	delete _graphicsMan;
 }
 
-Common::Error GroovieEngine::init() {
+Common::Error GroovieEngine::run() {
 	// Initialize the graphics
 	initGraphics(640, 480, true);
 
@@ -156,13 +156,8 @@
 		_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

Modified: scummvm/trunk/engines/groovie/groovie.h
===================================================================
--- scummvm/trunk/engines/groovie/groovie.h	2009-03-01 09:05:48 UTC (rev 39022)
+++ scummvm/trunk/engines/groovie/groovie.h	2009-03-01 09:12:32 UTC (rev 39023)
@@ -76,16 +76,7 @@
 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.