diff options
Diffstat (limited to 'engines/touche')
-rw-r--r-- | engines/touche/menu.cpp | 4 | ||||
-rw-r--r-- | engines/touche/saveload.cpp | 8 | ||||
-rw-r--r-- | engines/touche/touche.cpp | 8 | ||||
-rw-r--r-- | engines/touche/touche.h | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp index 2d7af18da3..fbc73d027e 100644 --- a/engines/touche/menu.cpp +++ b/engines/touche/menu.cpp @@ -331,14 +331,14 @@ void ToucheEngine::handleMenuAction(void *menu, int actionId) { break; case kActionPerformSaveLoad: if (menuData->mode == kMenuLoadStateMode) { - if (loadGameState(_saveLoadCurrentSlot) == 0) { + if (loadGameState(_saveLoadCurrentSlot) == Common::kNoError) { menuData->quit = true; } } else if (menuData->mode == kMenuSaveStateMode) { _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); const char *description = menuData->saveLoadDescriptionsTable[_saveLoadCurrentSlot]; if (strlen(description) > 0) { - if (saveGameState(_saveLoadCurrentSlot, description)) { + if (saveGameState(_saveLoadCurrentSlot, description) == Common::kNoError) { menuData->quit = true; } } diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index 0890d4688f..5d63d45bb5 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -316,7 +316,7 @@ void ToucheEngine::loadGameStateData(Common::ReadStream *stream) { debug(0, "Loaded state, current episode %d", _currentEpisodeNum); } -int ToucheEngine::saveGameState(int num, const char *description) { +Common::Error ToucheEngine::saveGameState(int num, const char *description) { bool saveOk = false; char gameStateFileName[64]; generateGameStateFileName(num, gameStateFileName, 63); @@ -337,10 +337,10 @@ int ToucheEngine::saveGameState(int num, const char *description) { } delete f; } - return saveOk; + return saveOk ? Common::kNoError : Common::kUnknownError; } -int ToucheEngine::loadGameState(int num) { +Common::Error ToucheEngine::loadGameState(int num) { bool loadOk = false; char gameStateFileName[64]; generateGameStateFileName(num, gameStateFileName, 63); @@ -360,7 +360,7 @@ int ToucheEngine::loadGameState(int num) { } delete f; } - return loadOk ? 0 : 1; + return loadOk ? Common::kNoError : Common::kUnknownError; } void ToucheEngine::readGameStateDescription(int num, char *description, int len) { diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 26170e2734..0033d80cb2 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -81,7 +81,7 @@ ToucheEngine::~ToucheEngine() { delete _midiPlayer; } -int ToucheEngine::init() { +Common::Error ToucheEngine::init() { _system->beginGFXTransaction(); initCommonGFX(true); _system->initSize(kScreenWidth, kScreenHeight); @@ -96,10 +96,10 @@ int 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 0; + return Common::kNoError; } -int ToucheEngine::go() { +Common::Error ToucheEngine::go() { res_openDataFile(); res_allocateTables(); res_loadSpriteImage(18, _menuKitData); @@ -111,7 +111,7 @@ int ToucheEngine::go() { res_deallocateTables(); res_closeDataFile(); - return 0; + return Common::kNoError; } void ToucheEngine::restart() { diff --git a/engines/touche/touche.h b/engines/touche/touche.h index 9d66d839a0..b5256a9d8f 100644 --- a/engines/touche/touche.h +++ b/engines/touche/touche.h @@ -362,8 +362,8 @@ public: virtual ~ToucheEngine(); // Engine APIs - virtual int init(); - virtual int go(); + virtual Common::Error init(); + virtual Common::Error go(); virtual bool hasFeature(EngineFeature f) const; virtual void syncSoundSettings(); @@ -497,8 +497,8 @@ protected: void saveGameStateData(Common::WriteStream *stream); void loadGameStateData(Common::ReadStream *stream); - int saveGameState(int num, const char *description); - int loadGameState(int num); + Common::Error saveGameState(int num, const char *description); + Common::Error loadGameState(int num); void readGameStateDescription(int num, char *description, int len); void generateGameStateFileName(int num, char *dst, int len, bool prefixOnly = false) const; int getGameStateFileSlot(const char *filename) const; |