diff options
| author | Torbjörn Andersson | 2006-04-10 08:04:45 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-04-10 08:04:45 +0000 |
| commit | 28c34673dcb7063797efac0dad28223ef0ddc80c (patch) | |
| tree | cfdb4a3955ce17ff12485b6f844c472f9d4b977c | |
| parent | e931f9d07d6fb597b7a1f139661421543a0537c8 (diff) | |
| download | scummvm-rg350-28c34673dcb7063797efac0dad28223ef0ddc80c.tar.gz scummvm-rg350-28c34673dcb7063797efac0dad28223ef0ddc80c.tar.bz2 scummvm-rg350-28c34673dcb7063797efac0dad28223ef0ddc80c.zip | |
Merged o_loadGame() and o_saveGame() into o1_loadUserGame() and
o1_saveUserGame().
svn-id: r21753
| -rw-r--r-- | engines/simon/items.cpp | 4 | ||||
| -rw-r--r-- | engines/simon/saveload.cpp | 8 | ||||
| -rw-r--r-- | engines/simon/simon.h | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 4ce3b9d1a5..ed3d773d42 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1111,14 +1111,14 @@ void SimonEngine::o1_setAdjNoun() { void SimonEngine::o1_saveUserGame() { // 132: save game _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); - o_saveGame(); + saveOrLoadDialog(false); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } void SimonEngine::o1_loadUserGame() { // 133: load game _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); - o_loadGame(); + saveOrLoadDialog(true); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); } diff --git a/engines/simon/saveload.cpp b/engines/simon/saveload.cpp index 5bed1d327c..c0296f72c4 100644 --- a/engines/simon/saveload.cpp +++ b/engines/simon/saveload.cpp @@ -33,14 +33,6 @@ namespace Simon { -void SimonEngine::o_saveGame() { - saveOrLoadDialog(false); -} - -void SimonEngine::o_loadGame() { - saveOrLoadDialog(true); -} - int SimonEngine::countSaveGames() { Common::InSaveFile *f; uint i = 1; diff --git a/engines/simon/simon.h b/engines/simon/simon.h index a553c731e0..e7adc346d9 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -574,8 +574,6 @@ protected: void o_waitForSync(uint a); void skipSpeech(); void o_sync(uint a); - void o_saveGame(); - void o_loadGame(); void o_confirmQuit(); void o_restoreIconArray(uint a); void o_freezeBottom(); |