[Scummvm-cvs-logs] scummvm master -> 1c753c046f18e9029fbc85539614839790e95921

[sev-]

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

Summary:
2a6cbd05f8 BBVS: Since we're using GUI for menus, switch iGUI to the relevant language
1c753c046f BBVS: Mark games as testing


Commit: 2a6cbd05f876fcab110238104a8917ff00409ff4
    https://github.com/scummvm/scummvm/commit/2a6cbd05f876fcab110238104a8917ff00409ff4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-18T01:11:05+01:00

Commit Message:
BBVS: Since we're using GUI for menus, switch iGUI to the relevant language

Changed paths:
    engines/bbvs/bbvs.cpp
    engines/bbvs/bbvs.h
    engines/bbvs/detection.cpp



diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 11e4b6c..1d668f9 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -39,6 +39,8 @@
 #include "common/error.h"
 #include "common/fs.h"
 #include "common/timer.h"
+#include "common/translation.h"
+#include "engines/advancedDetector.h"
 #include "engines/util.h"
 #include "graphics/cursorman.h"
 #include "graphics/font.h"
@@ -116,9 +118,15 @@ BbvsEngine::BbvsEngine(OSystem *syst, const ADGameDescription *gd) :
 
 	Engine::syncSoundSettings();
 
+	_oldGUILanguage	= TransMan.getCurrentLanguage();
+
+	if (gd->flags & GF_GUILANGSWITCH)
+		TransMan.setLanguage(getLanguageLocale(gd->language));
 }
 
 BbvsEngine::~BbvsEngine() {
+	if (TransMan.getCurrentLanguage() != _oldGUILanguage)
+		TransMan.setLanguage(_oldGUILanguage);
 
 	delete _random;
 
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index a2e08c8..d098aaf 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -63,6 +63,10 @@ class SoundMan;
 #define BBVS_SAVEGAME_VERSION 0
 
 enum {
+	GF_GUILANGSWITCH =    (1 << 0) // If GUI language switch is required for menus
+};
+
+enum {
 	kVerbLook      = 0,
 	kVerbUse       = 1,
 	kVerbTalk      = 2,
@@ -227,8 +231,11 @@ public:
 	void setNewSceneNum(int newSceneNum);
 	const Common::String getTargetName() { return _targetName; }
 	const ADGameDescription *_gameDescription;
+
 private:
 	Graphics::PixelFormat _pixelFormat;
+	Common::String _oldGUILanguage;
+
 public:
 	Common::RandomSource *_random;
 
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index b6f5689..5aad113 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -52,7 +52,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("vspr0001.vnm", "91c76b1048f93208cd7b1a05ebccb408", 1176976),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-		ADGF_NO_FLAGS,
+		GF_GUILANGSWITCH,
 		GUIO0()
 	},
 


Commit: 1c753c046f18e9029fbc85539614839790e95921
    https://github.com/scummvm/scummvm/commit/1c753c046f18e9029fbc85539614839790e95921
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-18T01:15:55+01:00

Commit Message:
BBVS: Mark games as testing

Changed paths:
    engines/bbvs/detection.cpp



diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index 5aad113..d2e3ab8 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -43,7 +43,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("vspr0001.vnm", "7ffe9b9e7ca322db1d48e86f5130578e", 1166628),
 		Common::EN_ANY,
 		Common::kPlatformWindows,
-		ADGF_NO_FLAGS,
+		ADGF_NO_FLAGS | ADGF_TESTING,
 		GUIO0()
 	},
 	{
@@ -52,7 +52,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("vspr0001.vnm", "91c76b1048f93208cd7b1a05ebccb408", 1176976),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-		GF_GUILANGSWITCH,
+		GF_GUILANGSWITCH | ADGF_TESTING,
 		GUIO0()
 	},