[Scummvm-cvs-logs] SF.net SVN: scummvm: [27414] scummvm/trunk/engines/parallaction/menu.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jun 15 08:30:45 CEST 2007


Revision: 27414
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27414&view=rev
Author:   Kirben
Date:     2007-06-14 23:30:44 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
When selecting language, ignore request for language that doesn't exist.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/menu.cpp

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-06-15 04:22:21 UTC (rev 27413)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-06-15 06:30:44 UTC (rev 27414)
@@ -182,9 +182,6 @@
 		return 1;
 	}
 
-	// TODO: should return the language ID supported by Amiga versions
-	// this can be done with some flags in the detection structures
-
 	// user can choose language in dos version
 
 	_vm->_gfx->setFont(kFontMenu);
@@ -207,13 +204,29 @@
 		if (_mouseButtons == kMouseLeftUp) {
 			for (uint16 _si = 0; _si < 4; _si++) {
 
-				if (80 + _si*49 >= _vm->_mousePos.x) continue;
-				if (110 - _si*25 >= _vm->_mousePos.y) continue;
+				if (80 + _si * 49 >= _vm->_mousePos.x) continue;
+				if (110 - _si * 25 >= _vm->_mousePos.y) continue;
 
-				if (128 + _si*49 <= _vm->_mousePos.x) continue;
-				if (180 - _si*25 <=_vm->_mousePos.y) continue;
+				if (128 + _si * 49 <= _vm->_mousePos.x) continue;
+				if (180 - _si * 25 <= _vm->_mousePos.y) continue;
 
 //				beep();
+
+				switch (_si) {
+				case 0:
+					if (!(_vm->getFeatures() & GF_LANG_IT))
+						continue;
+				case 1:
+					if (!(_vm->getFeatures() & GF_LANG_FR))
+						continue;
+				case 2:
+					if (!(_vm->getFeatures() & GF_LANG_EN))
+						continue;
+				case 3:
+					if (!(_vm->getFeatures() & GF_LANG_DE))
+						continue;
+				}
+
 				return _si;
 			}
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list