thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged o_loadGame() and o_saveGame() into o1_loadUserGame() and

Browse source 
o1_saveUserGame().

svn-id: r21753
This commit is contained in:
Torbjörn Andersson 2006-04-10 08:04:45 +00:00
parent e931f9d07d
commit 28c34673dc
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/simon/items.cpp
View file

@ -1111,14 +1111,14 @@ void SimonEngine::o1_setAdjNoun() {
void SimonEngine::o1_saveUserGame() { void SimonEngine::o1_saveUserGame() {
// 132: save game // 132: save game
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
o_saveGame(); saveOrLoadDialog(false);
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
} }
void SimonEngine::o1_loadUserGame() { void SimonEngine::o1_loadUserGame() {
// 133: load game // 133: load game
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
o_loadGame(); saveOrLoadDialog(true);
_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); _system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
} }

8
engines/simon/saveload.cpp
View file

@ -33,14 +33,6 @@
namespace Simon { namespace Simon {
void SimonEngine::o_saveGame() {
saveOrLoadDialog(false);
}
void SimonEngine::o_loadGame() {
saveOrLoadDialog(true);
}
int SimonEngine::countSaveGames() { int SimonEngine::countSaveGames() {
Common::InSaveFile *f; Common::InSaveFile *f;
uint i = 1; uint i = 1;

2
engines/simon/simon.h
View file

@ -574,8 +574,6 @@ protected:
void o_waitForSync(uint a); void o_waitForSync(uint a);
void skipSpeech(); void skipSpeech();
void o_sync(uint a); void o_sync(uint a);
void o_saveGame();
void o_loadGame();
void o_confirmQuit(); void o_confirmQuit();
void o_restoreIconArray(uint a); void o_restoreIconArray(uint a);
void o_freezeBottom(); void o_freezeBottom();