aboutsummaryrefslogtreecommitdiff
path: root/engines/cine
diff options
context:
space:
mode:
authorMax Horn2009-03-01 04:30:55 +0000
committerMax Horn2009-03-01 04:30:55 +0000
commit3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (patch)
treec726a8bcaa9f79bc5a79f3adaf5f32727b2048af /engines/cine
parentd0c2484502d195d05676065febe488393b490be5 (diff)
downloadscummvm-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/cine')
-rw-r--r--engines/cine/cine.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 29d2f05b89..4800604791 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -71,8 +71,15 @@ class CineEngine : 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();
+ }
virtual bool hasFeature(EngineFeature f) const;
void shutdown();