[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Tue May 27 17:08:11 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7466a

Modified Files:
	dialogs.cpp 
Log Message:
Fix for bug #744121: Indy3 'Save' button text

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- dialogs.cpp	14 May 2003 09:47:53 -0000	1.48
+++ dialogs.cpp	28 May 2003 00:07:56 -0000	1.49
@@ -175,15 +175,15 @@
 	if (stringno == 0)
 		return String();
 
-	if (_scumm->_features & GF_AFTER_V8	)
-		// TODO: Maybe grab the strings from the language file?
-		return string_map_table_v5[stringno - 1].string;
-	else if (_scumm->_features & GF_AFTER_V7)
+	if (_scumm->_features & GF_AFTER_V7)
 		result = _scumm->getStringAddressVar(string_map_table_v7[stringno - 1].num);
 	else if (_scumm->_features & GF_AFTER_V6)
 		result = _scumm->getStringAddressVar(string_map_table_v6[stringno - 1].num);
-	else
+	else if (_scumm->_features & GF_AFTER_V5)
 		result = _scumm->getStringAddress(string_map_table_v5[stringno - 1].num);
+	else
+		// TODO: For V8 games, maybe grab the strings from the language file?
+		return string_map_table_v5[stringno - 1].string;
 
 	if (result && *result == '/') {
 		byte tmp[256];





More information about the Scummvm-git-logs mailing list