[Scummvm-cvs-logs] SF.net SVN: scummvm: [28476] scummvm/trunk/engines/touche/touche.cpp
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Mon Aug 6 22:24:06 CEST 2007
Revision: 28476
http://scummvm.svn.sourceforge.net/scummvm/?rev=28476&view=rev
Author: cyx
Date: 2007-08-06 13:24:05 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
fixed loading of savestates on startup
Modified Paths:
--------------
scummvm/trunk/engines/touche/touche.cpp
Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp 2007-08-06 20:07:57 UTC (rev 28475)
+++ scummvm/trunk/engines/touche/touche.cpp 2007-08-06 20:24:05 UTC (rev 28476)
@@ -148,10 +148,7 @@
_waitingSetKeyCharNum3 = -1;
_currentEpisodeNum = 0;
- _newEpisodeNum = ConfMan.getInt("boot_param");
- if (_newEpisodeNum == 0) {
- _newEpisodeNum = kStartupEpisode;
- }
+ _newEpisodeNum = kStartupEpisode;
_newMusicNum = 0;
_currentMusicNum = 0;
@@ -252,15 +249,22 @@
readConfigurationSettings();
+ _inp_leftMouseButtonPressed = false;
+ _inp_rightMouseButtonPressed = false;
+
if (ConfMan.hasKey("save_slot")) {
loadGameState(ConfMan.getInt("save_slot"));
- _newEpisodeNum = _currentEpisodeNum;
+ _newEpisodeNum = 0;
+ resetSortedKeyCharsTable();
+ showCursor(true);
+ } else {
+ _newEpisodeNum = ConfMan.getInt("boot_param");
+ if (_newEpisodeNum == 0) {
+ _newEpisodeNum = kStartupEpisode;
+ }
+ showCursor(_newEpisodeNum != kStartupEpisode);
}
- _inp_leftMouseButtonPressed = false;
- _inp_rightMouseButtonPressed = false;
- showCursor(_newEpisodeNum != kStartupEpisode);
-
uint32 frameTimeStamp = _system->getMillis();
for (uint32 cycleCounter = 0; _flagsTable[611] == 0; ++cycleCounter) {
if ((cycleCounter % 3) == 0) {
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