[Scummvm-cvs-logs] SF.net SVN: scummvm:[47782] scummvm/trunk/engines/sci/engine

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Sun Jan 31 23:14:36 CET 2010


Revision: 47782
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47782&view=rev
Author:   mthreepwood
Date:     2010-01-31 22:14:35 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Make EngineState::getLanguage() check from the resource manager as to what language it has loaded before checking from what ScummVM has set and make kDoAudio use EngineState::getLanguage()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/engine/state.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-31 21:59:37 UTC (rev 47781)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-31 22:14:35 UTC (rev 47782)
@@ -149,7 +149,7 @@
 			if (language != -1)
 				s->resMan->setAudioLanguage(language);
 
-			return make_reg(0, s->resMan->getAudioLanguage());
+			return make_reg(0, s->getLanguage());
 		}
 		break;
 	case kSciAudioCD:

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-01-31 21:59:37 UTC (rev 47781)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-01-31 22:14:35 UTC (rev 47782)
@@ -153,8 +153,12 @@
 }
 
 kLanguage EngineState::getLanguage() {
-	kLanguage lang = K_LANG_ENGLISH;
+	kLanguage lang = (kLanguage)resMan->getAudioLanguage();
+	if (lang != K_LANG_NONE)
+		return lang;
 
+	lang = K_LANG_ENGLISH;
+
 	if (_kernel->_selectorCache.printLang != -1) {
 		lang = (kLanguage)GET_SEL32V(_segMan, _gameObj, printLang);
 


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