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

waltervn at users.sourceforge.net waltervn at users.sourceforge.net
Sun Jan 31 20:45:51 CET 2010


Revision: 47774
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47774&view=rev
Author:   waltervn
Date:     2010-01-31 19:45:51 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
SCI: Handle -1 properly when passed as a language id to DoAudio

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

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-31 19:44:40 UTC (rev 47773)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-31 19:45:51 UTC (rev 47774)
@@ -143,8 +143,14 @@
 		// In SCI1.1: tests for digital audio support
 		if (getSciVersion() == SCI_VERSION_1_1)
 			return make_reg(0, 1);
-		else
-			s->resMan->setAudioLanguage(argv[1].toSint16());
+		else {
+			int16 language = argv[1].toSint16();
+
+			if (language != -1)
+				s->resMan->setAudioLanguage(language);
+
+			return make_reg(0, s->resMan->getAudioLanguage());
+		}
 		break;
 	case kSciAudioCD:
 		return kDoCdAudio(s, argc - 1, argv + 1);

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-01-31 19:44:40 UTC (rev 47773)
+++ scummvm/trunk/engines/sci/resource.h	2010-01-31 19:45:51 UTC (rev 47774)
@@ -270,6 +270,7 @@
 	Common::List<ResourceId> *listResources(ResourceType type, int mapNumber = -1);
 
 	void setAudioLanguage(int language);
+	int getAudioLanguage() const { return (_audioMapSCI1 ? _audioMapSCI1->volume_number : 0); }
 	bool isVGA() const { return (_viewType == kViewVga) || (_viewType == kViewVga11); }
 	bool isAmiga32color() const { return _viewType == kViewAmiga; }
 	ViewType getViewType() const { return _viewType; }


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