[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.37,1.38

Robert Göffringmann lavosspawn at users.sourceforge.net
Thu Oct 21 02:02:25 CEST 2004


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

Modified Files:
	control.cpp 
Log Message:
enable czech control panel. should work.

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- control.cpp	28 Sep 2004 20:19:34 -0000	1.37
+++ control.cpp	21 Oct 2004 08:47:13 -0000	1.38
@@ -165,7 +165,7 @@
 	_music = pMusic;
 	_sound = pSound;
 	strcpy(_savePath, savePath);
-	_lStrings = _languageStrings + MIN(SwordEngine::_systemVars.language, (uint8)BS1_SPANISH) * 20;
+	_lStrings = _languageStrings + SwordEngine::_systemVars.language * 20;
 }
 
 void Control::askForCd(void) {
@@ -423,8 +423,12 @@
 	
 	if (SwordEngine::_systemVars.deathScreenFlag == 1)
 		panelId = SR_DEATHPANEL;
-	else
-		panelId = SR_PANEL_ENGLISH + MIN(SwordEngine::_systemVars.language, (uint8)BS1_SPANISH);
+	else {
+		if (SwordEngine::_systemVars.language <= BS1_SPANISH)
+			panelId = SR_PANEL_ENGLISH + SwordEngine::_systemVars.language;
+		else
+			panelId = SR_PANEL_ENGLISH;
+	}
 	
 	ControlButton *panel = new ControlButton( 0, 0, panelId, 0, _resMan, _screenBuf, _system);
 	panel->draw();





More information about the Scummvm-git-logs mailing list