[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.57,1.58

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4773

Modified Files:
	control.cpp 
Log Message:
After saving, return to the game instead of the main control panel. This is
how the original did it (the DOS version, at least -- I couldn't get the
Windows version to install under Wine), and is part of RFE #1273746.


Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- control.cpp	3 Sep 2005 19:59:33 -0000	1.57
+++ control.cpp	9 Sep 2005 07:32:29 -0000	1.58
@@ -311,7 +311,7 @@
 		_system->updateScreen();
 		delay(1000 / 12);
 		newMode = getClicks(mode, &retVal);
-	} while ((newMode != 1) && (retVal == 0) && (!SwordEngine::_systemVars.engineQuit));
+	} while ((newMode != BUTTON_DONE) && (retVal == 0) && (!SwordEngine::_systemVars.engineQuit));
 	destroyButtons();
 	_resMan->resClose(fontId);
 	_resMan->resClose(redFontId);
@@ -414,7 +414,7 @@
 			if (mode == BUTTON_SAVE_PANEL) {
 				_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 				if (saveToFile()) // don't go back to main panel if save fails.
-					return BUTTON_MAIN_PANEL;
+					return BUTTON_DONE;
 			} else {
 				if (restoreFromFile()) { // don't go back to main panel if restore fails.
 					*retVal |= CONTROL_GAME_RESTORED;