[Scummvm-cvs-logs] SF.net SVN: scummvm:[33997] scummvm/branches/branch-0-12-0/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 33997
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33997&view=rev
Author:   athrxx
Date:     2008-08-18 18:07:18 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
KYRA: two more files that I forgot to update

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/kyra/kyra_v1.cpp
    scummvm/branches/branch-0-12-0/engines/kyra/staticres.cpp

Modified: scummvm/branches/branch-0-12-0/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/kyra_v1.cpp	2008-08-18 17:58:20 UTC (rev 33996)
+++ scummvm/branches/branch-0-12-0/engines/kyra/kyra_v1.cpp	2008-08-18 18:07:18 UTC (rev 33997)
@@ -114,7 +114,7 @@
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (_flags.platform == Common::kPlatformPC98) {
 			if (_flags.gameID == GI_KYRA1)
-				_sound = new SoundTowns/*SoundPC98*/(this, _mixer);
+				_sound = new SoundPC98(this, _mixer);
 			else
 				_sound = new SoundTownsPC98_v2(this, _mixer);
 		} else if (midiDriver == MD_ADLIB) {

Modified: scummvm/branches/branch-0-12-0/engines/kyra/staticres.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/staticres.cpp	2008-08-18 17:58:20 UTC (rev 33996)
+++ scummvm/branches/branch-0-12-0/engines/kyra/staticres.cpp	2008-08-18 18:07:18 UTC (rev 33997)
@@ -1034,10 +1034,8 @@
 	}
 
 	// audio data tables
-#if 0
 	static const char *tIntro98[] = { "intro%d.dat" };
 	static const char *tIngame98[] = { "kyram%d.dat" };
-#endif
 
 	static const AudioDataStruct soundData_PC[] = {
 		{ _soundFilesIntro, _soundFilesIntroSize, 0, 0 },
@@ -1051,20 +1049,18 @@
 		{ 0, 0, 0, 0}
 	};
 
-#if 0
 	static const AudioDataStruct soundData_PC98[] = {
 		{ tIntro98, 1, 0, 0 },
 		{ tIngame98, 1, 0, 0 },
 		{ 0, 0, 0, 0}
 	};
-#endif
 
 	if (_flags.platform == Common::kPlatformPC)
 		_soundData = soundData_PC;
 	else if (_flags.platform == Common::kPlatformFMTowns)
 		_soundData = soundData_TOWNS;
 	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_TOWNS/*soundData_PC98*/;
+		_soundData = soundData_PC98;
 
 }
 
@@ -1263,11 +1259,9 @@
 	static const char *fmtMusicFileListFinale[] = { "finale%d.twn" };
 	static const char *fmtMusicFileListIngame[] = { "km%02d.twn" };
 
-#if 0
 	static const char *pc98MusicFileListIntro[] = { "intro%d.86" };
 	static const char *pc98MusicFileListFinale[] = { "finale%d.86" };
 	static const char *pc98MusicFileListIngame[] = { "km%02d.86" };
-#endif
 
 	static const AudioDataStruct soundData_PC[] = {
 		{ _musicFileListIntro, _musicFileListIntroSize, 0, 0 },
@@ -1281,20 +1275,18 @@
 		{ fmtMusicFileListFinale, 1, _cdaTrackTableFinale, _cdaTrackTableFinaleSize >> 1 }
 	};
 
-#if 0
 	static const AudioDataStruct soundData_PC98[] = {
 		{ pc98MusicFileListIntro, 1, 0, 0 },
 		{ pc98MusicFileListIngame, 1, 0, 0 },
 		{ pc98MusicFileListFinale, 1, 0, 0 }		
 	};
-#endif
 
 	if (_flags.platform == Common::kPlatformPC)
 		_soundData = soundData_PC;
 	else if (_flags.platform == Common::kPlatformFMTowns)
 		_soundData = soundData_TOWNS;
 	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_TOWNS/*soundData_PC98*/;
+		_soundData = soundData_PC98;
 
 	// setup sequence data
 	_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.