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/scumm/scumm.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/scumm/scumm.h')
| -rw-r--r-- | engines/scumm/scumm.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index f99f37d857..e08453eed8 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -447,8 +447,15 @@ public: 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; |