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

[lordhoto]

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:
415334fbe5 KYRA: Fix bug #3589441 "KYRA: LOL DOS is broken".
ae1403713c KYRA: Some slight cleanup.


Commit: 415334fbe51b6c1332db11a113069c62c1141608
    https://github.com/scummvm/scummvm/commit/415334fbe51b6c1332db11a113069c62c1141608
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-23T08:56:22-08:00

Commit Message:
KYRA: Fix bug #3589441 "KYRA: LOL DOS is broken".

In fact it affected all DOS versions of the game.
This is a regression from 93e69aa4da0558b05fc235684355ed38eed9863d.

Changed paths:
    engines/kyra/staticres_lol.cpp



diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index c23aed3..4ee5b12 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -214,11 +214,19 @@ void StaticResource::freeButtonDefs(void *&ptr, int &size) {
 }
 
 void LoLEngine::initStaticResource() {
-	// assign music resource data (not required for the PC version, resource loading is implemented differently there)
+	// assign music resource data.
 	if (_flags.isDemo) {
 		static const char *const file[] = { "LOREDEMO" };
 		SoundResourceInfo_TownsPC98V2 resInfoDemo(file, ARRAYSIZE(file), 0, 0, 0);
 		_sound->initAudioResourceInfo(kMusicIntro, &resInfoDemo);
+	} else if (_flags.platform == Common::kPlatformPC) {
+		static const char *const intro[] = { "LOREINTR" };
+		static const char *const finale[] = { "LOREFINL" };
+		SoundResourceInfo_PC resInfoIntro(intro, ARRAYSIZE(intro));
+		SoundResourceInfo_PC resInfoFinale(finale, ARRAYSIZE(finale));
+		_sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
+		// In game music file handling is different, thus does not need a file list.
+		_sound->initAudioResourceInfo(kMusicFinale, &resInfoFinale);
 	} else if (_flags.platform == Common::kPlatformPC98) {
 		static const char *const fileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
 		static const char *const fileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };


Commit: ae1403713cdccd98a9bab656db74fc6172c82cbb
    https://github.com/scummvm/scummvm/commit/ae1403713cdccd98a9bab656db74fc6172c82cbb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-23T08:56:28-08:00

Commit Message:
KYRA: Some slight cleanup.

Changed paths:
    engines/kyra/staticres_lol.cpp



diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index 4ee5b12..f974240 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -215,18 +215,20 @@ void StaticResource::freeButtonDefs(void *&ptr, int &size) {
 
 void LoLEngine::initStaticResource() {
 	// assign music resource data.
-	if (_flags.isDemo) {
-		static const char *const file[] = { "LOREDEMO" };
-		SoundResourceInfo_TownsPC98V2 resInfoDemo(file, ARRAYSIZE(file), 0, 0, 0);
-		_sound->initAudioResourceInfo(kMusicIntro, &resInfoDemo);
-	} else if (_flags.platform == Common::kPlatformPC) {
-		static const char *const intro[] = { "LOREINTR" };
-		static const char *const finale[] = { "LOREFINL" };
-		SoundResourceInfo_PC resInfoIntro(intro, ARRAYSIZE(intro));
-		SoundResourceInfo_PC resInfoFinale(finale, ARRAYSIZE(finale));
-		_sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
-		// In game music file handling is different, thus does not need a file list.
-		_sound->initAudioResourceInfo(kMusicFinale, &resInfoFinale);
+	if (_flags.platform == Common::kPlatformPC) {
+		if (_flags.isDemo) {
+			static const char *const file[] = { "LOREDEMO" };
+			SoundResourceInfo_PC resInfoDemo(file, ARRAYSIZE(file));
+			_sound->initAudioResourceInfo(kMusicIntro, &resInfoDemo);
+		} else {
+			static const char *const intro[] = { "LOREINTR" };
+			static const char *const finale[] = { "LOREFINL" };
+			SoundResourceInfo_PC resInfoIntro(intro, ARRAYSIZE(intro));
+			SoundResourceInfo_PC resInfoFinale(finale, ARRAYSIZE(finale));
+			_sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
+			// In game music file handling is different, thus does not need a file list.
+			_sound->initAudioResourceInfo(kMusicFinale, &resInfoFinale);
+		}
 	} else if (_flags.platform == Common::kPlatformPC98) {
 		static const char *const fileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
 		static const char *const fileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };