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.cpp | |
| 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.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index fd6d354d63..15fee4115c 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -824,13 +824,9 @@ ScummEngine_vCUPhe::~ScummEngine_vCUPhe() { 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(); |