[Scummvm-cvs-logs] CVS: scummvm/sword2 defs.h,1.17,1.18 save_rest.cpp,1.67,1.68

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon Feb 28 05:24:35 CET 2005


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

Modified Files:
	defs.h save_rest.cpp 
Log Message:
Changed a few more hard-coded text-ids to constants.


Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/defs.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- defs.h	27 Feb 2005 16:20:01 -0000	1.17
+++ defs.h	28 Feb 2005 13:22:31 -0000	1.18
@@ -74,7 +74,12 @@
 	TEXT_SPEECH_VOLUME		= 0x08EB000F,
 	TEXT_FX_VOLUME			= 0x08EB0010,
 	TEXT_GFX_QUALITY		= 0x08EB0011,
-	TEXT_REVERSE_STEREO		= 0x08EB0015
+	TEXT_REVERSE_STEREO		= 0x08EB0015,
+	TEXT_RESTORE_CANT_OPEN		= 0x0CBA017E,
+	TEXT_RESTORE_INCOMPATIBLE	= 0x0CBA017F,
+	TEXT_RESTORE_FAILED		= 0x0CBA0181,
+	TEXT_SAVE_CANT_OPEN		= 0x0CBA0182,
+	TEXT_SAVE_FAILED		= 0x0CBA0184
 };
 
 // Always 8 (George object used for Nico player character as well)

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- save_rest.cpp	20 Feb 2005 15:38:47 -0000	1.67
+++ save_rest.cpp	28 Feb 2005 13:22:31 -0000	1.68
@@ -108,10 +108,10 @@
 
 		switch (errorCode) {
 		case SR_ERR_FILEOPEN:
-			textId = 213516674;
+			textId = TEXT_SAVE_CANT_OPEN;
 			break;
-		default:	// SR_ERR_WRITEFAIL
-			textId = 213516676;
+		default:
+			textId = TEXT_SAVE_FAILED;
 			break;
 		}
 
@@ -226,13 +226,13 @@
 
 		switch (errorCode) {
 		case SR_ERR_FILEOPEN:
-			textId = 213516670;
+			textId = TEXT_RESTORE_CANT_OPEN;
 			break;
 		case SR_ERR_INCOMPATIBLE:
-			textId = 213516671;
+			textId = TEXT_RESTORE_INCOMPATIBLE;
 			break;
-		default:	// SR_ERR_READFAIL
-			textId = 213516673;
+		default:
+			textId = TEXT_RESTORE_FAILED;
 			break;
 		}
 





More information about the Scummvm-git-logs mailing list