[Scummvm-cvs-logs] SF.net SVN: scummvm:[39002] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Mar 1 05:30:55 CET 2009
Revision: 39002
http://scummvm.svn.sourceforge.net/scummvm/?rev=39002&view=rev
Author: fingolfin
Date: 2009-03-01 04:30:55 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors
Modified Paths:
--------------
scummvm/trunk/base/main.cpp
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/cine/cine.h
scummvm/trunk/engines/cruise/cruise.h
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/gob/gob.h
scummvm/trunk/engines/groovie/groovie.h
scummvm/trunk/engines/igor/igor.h
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/lure/lure.h
scummvm/trunk/engines/m4/m4.h
scummvm/trunk/engines/made/made.h
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/queen/queen.h
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/sci/sci.h
scummvm/trunk/engines/scumm/he/intern_he.h
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/scumm.h
scummvm/trunk/engines/sky/sky.h
scummvm/trunk/engines/sword1/sword1.h
scummvm/trunk/engines/sword2/sword2.h
scummvm/trunk/engines/tinsel/tinsel.h
scummvm/trunk/engines/touche/touche.h
scummvm/trunk/engines/tucker/tucker.h
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/base/main.cpp 2009-03-01 04:30:55 UTC (rev 39002)
@@ -188,17 +188,9 @@
// Inform backend that the engine is about to be run
system.engineInit();
- // Init the engine (this might change the screen parameters)
- // TODO: We should specify what return values
- Common::Error result = engine->init();
+ // Run the engine
+ Common::Error result = engine->run();
- // Run the game engine if the initialization was successful.
- if (result == Common::kNoError) {
- result = engine->go();
- } else {
- // TODO: Set an error flag, notify user about the problem
- }
-
// Inform backend that the engine finished
system.engineDone();
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/agi/agi.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -696,7 +696,15 @@
class AgiBase : public ::Engine {
protected:
// Engine API
- virtual Common::Error init();
+ Common::Error init();
+ virtual Common::Error go() = 0;
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void initialize() = 0;
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/agos/agos.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -166,8 +166,15 @@
friend class MoviePlayerSMK;
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
Modified: scummvm/trunk/engines/cine/cine.h
===================================================================
--- scummvm/trunk/engines/cine/cine.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/cine/cine.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -71,8 +71,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
void shutdown();
Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/cruise/cruise.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -61,8 +61,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
void shutdown();
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/drascula/drascula.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -276,8 +276,15 @@
class DrasculaEngine : public ::Engine {
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
public:
DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gameDesc);
Modified: scummvm/trunk/engines/engine.h
===================================================================
--- scummvm/trunk/engines/engine.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/engine.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -144,20 +144,12 @@
virtual ~Engine();
/**
- * Init the engine.
+ * Init the engine and start its main loop.
* @return returns kNoError on success, else an error code.
*/
- virtual Common::Error init() = 0;
+ virtual Common::Error run() = 0;
/**
- * Start the main engine loop.
- * The return value is not yet used, but could indicate whether the user
- * wants to return to the launch or to fully quit ScummVM.
- * @return returns kNoError on success, else an error code.
- */
- virtual Common::Error go() = 0;
-
- /**
* Prepare an error string, which is printed by the error() function.
*/
virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/gob/gob.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -191,8 +191,15 @@
uint32 _pauseStart;
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void pauseEngineIntern(bool pause);
Modified: scummvm/trunk/engines/groovie/groovie.h
===================================================================
--- scummvm/trunk/engines/groovie/groovie.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/groovie/groovie.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -74,20 +74,29 @@
~GroovieEngine();
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();
+ }
- void errorString(const char *buf_input, char *buf_output, int buf_output_size);
+ virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
-public:
- bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const;
- bool canLoadGameStateCurrently();
- Common::Error loadGameState(int slot);
- void syncSoundSettings();
+ virtual bool canLoadGameStateCurrently();
+ virtual Common::Error loadGameState(int slot);
+ virtual void syncSoundSettings();
- Debugger *getDebugger() { return _debugger; }
+ virtual Debugger *getDebugger() { return _debugger; }
+public:
void waitForInput();
Script _script;
Modified: scummvm/trunk/engines/igor/igor.h
===================================================================
--- scummvm/trunk/engines/igor/igor.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/igor/igor.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -312,8 +312,15 @@
IgorEngine(OSystem *system, const DetectedGameVersion *dgv);
virtual ~IgorEngine();
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
void handleOptionsMenu_paintSave();
bool handleOptionsMenu_handleKeyDownSave(int key);
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-03-01 04:30:55 UTC (rev 39002)
@@ -1550,7 +1550,7 @@
#pragma mark -
-void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, int page, int sfx, int sFrame, int flags) {
+void KyraEngine_HoF::loadInvWsa(const char *filename, int run_, int delayTime, int page, int sfx, int sFrame, int flags) {
int wsaFlags = 1;
if (flags)
wsaFlags |= 2;
@@ -1583,7 +1583,7 @@
_invWsa.running = true;
_invWsa.timer = _system->getMillis();
- if (run) {
+ if (run_) {
while (_invWsa.running && !skipFlag() && !shouldQuit()) {
update();
_system->delayMillis(10);
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -176,6 +176,14 @@
protected:
// Engine APIs
virtual Common::Error init();
+ virtual Common::Error go() = 0;
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual ::GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
virtual void pauseEngineIntern(bool pause);
Modified: scummvm/trunk/engines/lure/lure.h
===================================================================
--- scummvm/trunk/engines/lure/lure.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/lure/lure.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -71,8 +71,15 @@
bool _saveLoadAllowed;
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
virtual void pauseEngineIntern(bool pause);
Modified: scummvm/trunk/engines/m4/m4.h
===================================================================
--- scummvm/trunk/engines/m4/m4.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/m4/m4.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -112,8 +112,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
void shutdown();
Modified: scummvm/trunk/engines/made/made.h
===================================================================
--- scummvm/trunk/engines/made/made.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/made/made.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -80,8 +80,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
public:
MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc);
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -242,6 +242,15 @@
// Engine APIs
virtual Common::Error init();
+ virtual Common::Error go() = 0;
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
+
virtual bool hasFeature(EngineFeature f) const;
virtual void pauseEngineIntern(bool pause);
virtual GUI::Debugger *getDebugger();
@@ -469,8 +478,8 @@
Parallaction_br(OSystem* syst, const PARALLACTIONGameDescription *gameDesc);
~Parallaction_br();
- Common::Error init();
- Common::Error go();
+ virtual Common::Error init();
+ virtual Common::Error go();
public:
virtual void parseLocation(const char* name);
Modified: scummvm/trunk/engines/queen/queen.h
===================================================================
--- scummvm/trunk/engines/queen/queen.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/queen/queen.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -129,8 +129,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/saga/saga.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -445,6 +445,13 @@
// 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();
+ }
bool hasFeature(EngineFeature f) const;
void syncSoundSettings();
void pauseEngineIntern(bool pause);
Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/sci/sci.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -76,8 +76,15 @@
SciEngine(OSystem *syst, const SciGameDescription *desc);
~SciEngine();
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
GUI::Debugger *getDebugger() { return _console; }
Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/scumm/he/intern_he.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -669,8 +669,7 @@
ScummEngine_vCUPhe(OSystem *syst, const DetectorResult &dr);
~ScummEngine_vCUPhe();
- Common::Error init();
- Common::Error go();
+ virtual Common::Error run();
void parseEvents();
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2009-03-01 04:30:55 UTC (rev 39002)
@@ -824,13 +824,9 @@
delete _cupPlayer;
}
-Common::Error ScummEngine_vCUPhe::init() {
+Common::Error ScummEngine_vCUPhe::run() {
initGraphics(CUP_Player::kDefaultVideoWidth, CUP_Player::kDefaultVideoHeight, true);
- return Common::kNoError;
-}
-
-Common::Error ScummEngine_vCUPhe::go() {
if (_cupPlayer->open(_filenamePattern.pattern)) {
_cupPlayer->play();
_cupPlayer->close();
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/scumm/scumm.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -447,8 +447,15 @@
virtual ~ScummEngine();
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
virtual GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
Modified: scummvm/trunk/engines/sky/sky.h
===================================================================
--- scummvm/trunk/engines/sky/sky.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/sky/sky.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -91,8 +91,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
Modified: scummvm/trunk/engines/sword1/sword1.h
===================================================================
--- scummvm/trunk/engines/sword1/sword1.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/sword1/sword1.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -85,8 +85,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
// FIXME: Loading a game through the GMM crashes the game
Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/sword2/sword2.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -124,8 +124,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual GUI::Debugger *getDebugger();
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
Modified: scummvm/trunk/engines/tinsel/tinsel.h
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/tinsel/tinsel.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -141,8 +141,15 @@
protected:
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
Common::Error loadGameState(int slot);
#if 0
Modified: scummvm/trunk/engines/touche/touche.h
===================================================================
--- scummvm/trunk/engines/touche/touche.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/touche/touche.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -370,8 +370,15 @@
virtual ~ToucheEngine();
// Engine APIs
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
Modified: scummvm/trunk/engines/tucker/tucker.h
===================================================================
--- scummvm/trunk/engines/tucker/tucker.h 2009-03-01 04:29:09 UTC (rev 39001)
+++ scummvm/trunk/engines/tucker/tucker.h 2009-03-01 04:30:55 UTC (rev 39002)
@@ -240,8 +240,15 @@
TuckerEngine(OSystem *system, Common::Language language, uint32 flags);
virtual ~TuckerEngine();
- virtual Common::Error init();
- virtual Common::Error go();
+ Common::Error init();
+ Common::Error go();
+ virtual Common::Error run() {
+ Common::Error err;
+ err = init();
+ if (err != Common::kNoError)
+ return err;
+ return go();
+ }
virtual bool hasFeature(EngineFeature f) const;
virtual void syncSoundSettings();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list