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

[clone2727]

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:
bb12f77cbf BBVS: Fix compilation without translation enabled


Commit: bb12f77cbfbcdf51538d68db91dd9e0f7ad4509e
    https://github.com/scummvm/scummvm/commit/bb12f77cbfbcdf51538d68db91dd9e0f7ad4509e
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-12-21T17:58:09-05:00

Commit Message:
BBVS: Fix compilation without translation enabled

A regression from 2a6cbd0

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



diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 816b713..d40d5e4 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -118,15 +118,19 @@ BbvsEngine::BbvsEngine(OSystem *syst, const ADGameDescription *gd) :
 
 	Engine::syncSoundSettings();
 
+#ifdef USE_TRANSLATION
 	_oldGUILanguage	= TransMan.getCurrentLanguage();
 
 	if (gd->flags & GF_GUILANGSWITCH)
 		TransMan.setLanguage(getLanguageLocale(gd->language));
+#endif
 }
 
 BbvsEngine::~BbvsEngine() {
+#ifdef USE_TRANSLATION
 	if (TransMan.getCurrentLanguage() != _oldGUILanguage)
 		TransMan.setLanguage(_oldGUILanguage);
+#endif
 
 	delete _random;
 
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index d098aaf..ff4afe9 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -234,7 +234,10 @@ public:
 
 private:
 	Graphics::PixelFormat _pixelFormat;
+
+#ifdef USE_TRANSLATION
 	Common::String _oldGUILanguage;
+#endif
 
 public:
 	Common::RandomSource *_random;