[Scummvm-cvs-logs] SF.net SVN: scummvm:[41528] scummvm/trunk/engines/groovie

jvprat at users.sourceforge.net jvprat at users.sourceforge.net
Mon Jun 15 00:10:18 CEST 2009


Revision: 41528
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41528&view=rev
Author:   jvprat
Date:     2009-06-14 22:10:17 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Fix groovie's GUI game options

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/detection.cpp
    scummvm/trunk/engines/groovie/groovie.cpp

Modified: scummvm/trunk/engines/groovie/detection.cpp
===================================================================
--- scummvm/trunk/engines/groovie/detection.cpp	2009-06-14 21:49:33 UTC (rev 41527)
+++ scummvm/trunk/engines/groovie/detection.cpp	2009-06-14 22:10:17 UTC (rev 41528)
@@ -48,8 +48,6 @@
 	{0, 0}
 };
 
-using Common::GUIO_NONE;
-
 static const GroovieGameDescription gameDescriptions[] = {
 
 	// The 7th Guest DOS English
@@ -57,7 +55,7 @@
 		{
 			"t7g", "",
 			AD_ENTRY1s("script.grv", "d1b8033b40aa67c076039881eccce90d", 16659),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NONE
 		},
 		kGroovieT7G, 0
 	},
@@ -67,7 +65,7 @@
 		{
 			"t7g", "",
 			AD_ENTRY1s("script.grv", "6e30b54b1f3bc2262cdcf7961db2ae67", 17191),
-			Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, Common::GUIO_NONE
 		},
 		kGroovieT7G, 0
 	},
@@ -81,7 +79,7 @@
 				{ "intro.gjd", 0, NULL, 31711554},
 				{ NULL, 0, NULL, 0}
 			},
-			Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NONE
 		},
 		kGroovieT7G, 0
 	},
@@ -92,7 +90,7 @@
 		{
 			"11h", "",
 			AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NONE
 		},
 		kGroovieV2, 1
 	},
@@ -102,7 +100,7 @@
 		{
 			"11h", "Demo",
 			AD_ENTRY1s("disk.1", "aacb32ce07e0df2894bd83a3dee40c12", 70),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, Common::GUIO_NOLAUNCHLOAD
 		},
 		kGroovieV2, 1
 	},
@@ -112,7 +110,7 @@
 		{
 			"11h", "Making Of",
 			AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD
 		},
 		kGroovieV2, 2
 	},
@@ -122,7 +120,7 @@
 		{
 			"clandestiny", "Trailer",
 			AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NOMIDI | Common::GUIO_NOLAUNCHLOAD
 		},
 		kGroovieV2, 3
 	},
@@ -132,7 +130,7 @@
 		{
 			"clandestiny", "",
 			AD_ENTRY1s("disk.1", "f79fc1515174540fef6a34132efc4c53", 76),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NOMIDI
 		},
 		kGroovieV2, 1
 	},
@@ -142,7 +140,7 @@
 		{
 			"unclehenry", "",
 			AD_ENTRY1s("disk.1", "0e1b1d3cecc4fc7efa62a968844d1f7a", 72),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NOMIDI
 		},
 		kGroovieV2, 1
 	},
@@ -152,7 +150,7 @@
 		{
 			"tlc", "",
 			AD_ENTRY1s("disk.1", "32a1afa68478f1f9d2b25eeea427f2e3", 84),
-			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE
+			Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS, Common::GUIO_NOMIDI
 		},
 		kGroovieV2, 1
 	},
@@ -179,7 +177,7 @@
 	// Flags
 	kADFlagUseExtraAsHint,
 	// Additional GUI options (for every game}
-	Common::GUIO_NOMIDI
+	Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX
 };
 
 

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2009-06-14 21:49:33 UTC (rev 41527)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2009-06-14 22:10:17 UTC (rev 41528)
@@ -264,6 +264,11 @@
 
 void GroovieEngine::syncSoundSettings() {
 	_musicPlayer->setUserVolume(ConfMan.getInt("music_volume"));
+	// VDX videos just contain one digital audio track, which can be used for
+	// both SFX or Speech, but the engine doesn't know what they contain, so
+	// we have to use just one volume setting for videos.
+	// We use "speech" because most users will want to change the videos
+	// volume when they can't hear the speech because of the music.
 	_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, ConfMan.getInt("speech_volume"));
 }
 


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