diff options
| author | Max Horn | 2009-03-01 04:42:46 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-01 04:42:46 +0000 |
| commit | dd98126423d915c19baf43184ba40fb0d9a68b64 (patch) | |
| tree | dc6c65d5ca3d7c5c69f54e9dc980067980a2ae9a /engines/touche/touche.cpp | |
| parent | 3fcbda829a2aa17cbaf6423d34f69214b91b0e6c (diff) | |
| download | scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.tar.gz scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.tar.bz2 scummvm-rg350-dd98126423d915c19baf43184ba40fb0d9a68b64.zip | |
Engines: Fused several init&go methods into a single run method
svn-id: r39003
Diffstat (limited to 'engines/touche/touche.cpp')
| -rw-r--r-- | engines/touche/touche.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index cdb9bf1fed..5d79e0fb9a 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -81,7 +81,7 @@ ToucheEngine::~ToucheEngine() { delete _midiPlayer; } -Common::Error ToucheEngine::init() { +Common::Error ToucheEngine::run() { initGraphics(kScreenWidth, kScreenHeight, true); Graphics::setupFont(_language); @@ -93,10 +93,7 @@ Common::Error ToucheEngine::init() { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - return Common::kNoError; -} -Common::Error ToucheEngine::go() { res_openDataFile(); res_allocateTables(); res_loadSpriteImage(18, _menuKitData); |