[Scummvm-cvs-logs] SF.net SVN: scummvm: [21753] scummvm/trunk/engines/simon
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Apr 10 01:05:04 CEST 2006
Revision: 21753
Author: eriktorbjorn
Date: 2006-04-10 01:04:45 -0700 (Mon, 10 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21753&view=rev
Log Message:
-----------
Merged o_loadGame() and o_saveGame() into o1_loadUserGame() and
o1_saveUserGame().
Modified Paths:
--------------
scummvm/trunk/engines/simon/items.cpp
scummvm/trunk/engines/simon/saveload.cpp
scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp 2006-04-10 08:00:29 UTC (rev 21752)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-10 08:04:45 UTC (rev 21753)
@@ -1111,14 +1111,14 @@
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);
}
Modified: scummvm/trunk/engines/simon/saveload.cpp
===================================================================
--- scummvm/trunk/engines/simon/saveload.cpp 2006-04-10 08:00:29 UTC (rev 21752)
+++ scummvm/trunk/engines/simon/saveload.cpp 2006-04-10 08:04:45 UTC (rev 21753)
@@ -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;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-10 08:00:29 UTC (rev 21752)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-10 08:04:45 UTC (rev 21753)
@@ -574,8 +574,6 @@
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();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list