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

[lordhoto at users.sourceforge.net]

Revision: 33996
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33996&view=rev
Author:   lordhoto
Date:     2008-08-18 17:58:20 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Reverted parts of r33995. (Fixes compilation)

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

Modified: scummvm/branches/branch-0-12-0/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/sound_adlib.cpp	2008-08-18 17:53:26 UTC (rev 33995)
+++ scummvm/branches/branch-0-12-0/engines/kyra/sound_adlib.cpp	2008-08-18 17:58:20 UTC (rev 33996)
@@ -236,9 +236,6 @@
 
 	uint8 *getProgram(int progId) {
 		uint16 offset = READ_LE_UINT16(_soundData + 2 * progId);
-		//TODO: Check in LoL CD Adlib driver
-		if (offset == 0xFFFF)
-			return 0;
 		return _soundData + READ_LE_UINT16(_soundData + 2 * progId);
 	}
 
@@ -1286,9 +1283,6 @@
 		return 0;
 
 	uint8 *ptr = getProgram(value);
-	//TODO: Check in LoL CD Adlib driver
-	if (!ptr)
-		return 0;
 	uint8 chan = *ptr++;
 	uint8 priority = *ptr++;
 
@@ -2220,7 +2214,7 @@
 SoundAdlibPC::SoundAdlibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) {
 	memset(_trackEntries, 0, sizeof(_trackEntries));
-	_v2 = (_vm->gameFlags().gameID == GI_KYRA2) || (_vm->gameFlags().gameID == GI_LOL);
+	_v2 = (_vm->gameFlags().gameID == GI_KYRA2);
 	_driver = new AdlibDriver(mixer, _v2);
 	assert(_driver);
 


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