[Scummvm-cvs-logs] scummvm master -> e8ad4df1fa93de65a7ed40c7e32a4b428e4fe7fa

eriktorbjorn eriktorbjorn at telia.com
Sat Oct 6 16:25:04 CEST 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e8ad4df1fa SWORD1: Enable American ("Circle of Blood") panel


Commit: e8ad4df1fa93de65a7ed40c7e32a4b428e4fe7fa
    https://github.com/scummvm/scummvm/commit/e8ad4df1fa93de65a7ed40c7e32a4b428e4fe7fa
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-10-06T07:24:00-07:00

Commit Message:
SWORD1: Enable American ("Circle of Blood") panel

If the language is explicitly set to American English, use the
American version of the panel for the main control panel. In all
other aspects, American English will behave as British English,
so it shouldn't break anything.

Changed paths:
    engines/sword1/control.cpp
    engines/sword1/sword1.cpp
    engines/sword1/sword1.h



diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 6e39511..7cd85df 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -541,7 +541,9 @@ void Control::setupMainPanel() {
 	if (SwordEngine::_systemVars.controlPanelMode == CP_DEATHSCREEN)
 		panelId = SR_DEATHPANEL;
 	else {
-		if (SwordEngine::_systemVars.language <= BS1_SPANISH)
+		if (SwordEngine::_systemVars.realLanguage == Common::EN_USA)
+			panelId = SR_PANEL_AMERICAN;
+		else if (SwordEngine::_systemVars.language <= BS1_SPANISH)
 			panelId = SR_PANEL_ENGLISH + SwordEngine::_systemVars.language;
 		else
 			panelId = SR_PANEL_ENGLISH;
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 75e8f72..fa593b8 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -116,8 +116,9 @@ Common::Error SwordEngine::init() {
 	_systemVars.controlPanelMode = CP_NEWGAME;
 	_systemVars.forceRestart = false;
 	_systemVars.wantFade = true;
+	_systemVars.realLanguage = Common::parseLanguage(ConfMan.get("language"));
 
-	switch (Common::parseLanguage(ConfMan.get("language"))) {
+	switch (_systemVars.realLanguage) {
 	case Common::DE_DEU:
 		_systemVars.language = BS1_GERMAN;
 		break;
@@ -138,6 +139,7 @@ Common::Error SwordEngine::init() {
 		break;
 	default:
 		_systemVars.language = BS1_ENGLISH;
+		break;
 	}
 
 	_systemVars.showText = ConfMan.getBool("subtitles");
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index ccdc2d3..ec6555b 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -75,6 +75,7 @@ struct SystemVars {
 	uint8   language;
 	bool    isDemo;
 	Common::Platform platform;
+	Common::Language realLanguage;
 };
 
 class SwordEngine : public Engine {






More information about the Scummvm-git-logs mailing list