[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.66,1.66.2.1

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Sun Jul 18 11:35:03 CEST 2004


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

Modified Files:
      Tag: branch-0-6-0
	control.cpp 
Log Message:
Backported the hacky "save failed" error dialog from the trunk. There's
already a better one in the trunk, but it still has some issues (the cursor
is almost invisible when the error is shown), and unless that's fixed this
will have to do for 0.6.1.


Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -d -r1.66 -r1.66.2.1
--- control.cpp	26 Jan 2004 20:28:32 -0000	1.66
+++ control.cpp	18 Jul 2004 18:34:27 -0000	1.66.2.1
@@ -885,8 +885,16 @@
 						_selectedGame = _firstText;
 						refreshNames = true;
 					}
-					if ((clickRes == CANCEL_PRESSED) || (clickRes == NO_DISK_SPACE) || 
-						(clickRes == GAME_RESTORED))
+					if (clickRes == NO_DISK_SPACE) {
+						// HACK: We have a better error dialog in
+						// the trunk, but this will do for 0.6.1,
+						// unless someone fixes NewGui's cursor
+						// color to be more well defined.
+						char saveFailed[] = "Could not save!";
+						getYesNo(saveFailed);
+						quitPanel = true;
+					}
+					if ((clickRes == CANCEL_PRESSED) || (clickRes == GAME_RESTORED))
 						quitPanel = true;
 
 					if (clickRes == GAME_SAVED) {





More information about the Scummvm-git-logs mailing list