diff options
| author | Max Horn | 2009-03-01 04:30:55 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-01 04:30:55 +0000 |
| commit | 3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (patch) | |
| tree | c726a8bcaa9f79bc5a79f3adaf5f32727b2048af /engines/engine.h | |
| parent | d0c2484502d195d05676065febe488393b490be5 (diff) | |
| download | scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.tar.gz scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.tar.bz2 scummvm-rg350-3fcbda829a2aa17cbaf6423d34f69214b91b0e6c.zip | |
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
svn-id: r39002
Diffstat (limited to 'engines/engine.h')
| -rw-r--r-- | engines/engine.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/engines/engine.h b/engines/engine.h index bcf398a813..45477f408d 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -144,18 +144,10 @@ public: 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; - - /** - * 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; + virtual Common::Error run() = 0; /** * Prepare an error string, which is printed by the error() function. |