[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.122,1.123
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Mon Jul 11 06:25:03 CEST 2005
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7755
Modified Files:
items.cpp
Log Message:
In o_quit_if_user_presses_y(), assume that any unknown language (e.g.
"English (GB)") behaves like "English (US)". This is consistent with how we
handle language in the rest of the Simon engine, as far as I can see.
Should "n" really be the key for a negative answer in all languages?
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- items.cpp 24 Jun 2005 16:11:11 -0000 1.122
+++ items.cpp 11 Jul 2005 13:22:55 -0000 1.123
@@ -1295,6 +1295,32 @@
}
void SimonEngine::o_quit_if_user_presses_y() {
+ // If all else fails, use English as fallback.
+ byte keyYes = 'y';
+ byte keyNo = 'n';
+
+ switch (_language) {
+ case 21: // Russian
+ break;
+ case 20: // Hebrew
+ keyYes = 'f';
+ break;
+ case 5: // Spanish
+ keyYes = 's';
+ break;
+ case 3: // Italian
+ keyYes = 's';
+ break;
+ case 2: // French
+ keyYes = 'o';
+ break;
+ case 1: // German
+ keyYes = 'j';
+ break;
+ default:
+ break;
+ }
+
for (;;) {
delay(1);
#ifdef _WIN32_WCE
@@ -1307,22 +1333,11 @@
}
}
#endif
- if (_keyPressed == 'f' && _language == 20) // Hebrew
- shutdown();
- if (_keyPressed == 's' && _language == 5) // Spanish
- shutdown();
- if (_keyPressed == 's' && _language == 3) // Italian
- shutdown();
- if (_keyPressed == 'o' && _language == 2) // French
- shutdown();
- if (_keyPressed == 'j' && _language == 1) // German
- shutdown();
- if (_keyPressed == 'y' && _language == 0) // English
+ if (_keyPressed == keyYes)
shutdown();
- if (_keyPressed == 'n')
- goto get_out;
+ else if (_keyPressed == keyNo)
+ break;
}
-get_out:;
}
void SimonEngine::o_unk_137(uint fcs_index) {
More information about the Scummvm-git-logs
mailing list