[Scummvm-cvs-logs] SF.net SVN: scummvm:[43049] scummvm/branches/gsoc2009-mods

[nolange at users.sourceforge.net]

Revision: 43049
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43049&view=rev
Author:   nolange
Date:     2009-08-04 17:43:56 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
added warning should the sound files not be available (intro will hang if there is no musictimer)

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj
    scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj
    scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
    scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp

Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj	2009-08-04 17:22:18 UTC (rev 43048)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/scumm.vcproj	2009-08-04 17:43:56 UTC (rev 43049)
@@ -645,6 +645,14 @@
 		<File
 			RelativePath="..\..\engines\scumm\player_v4a.cpp"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					DisableSpecificWarnings="$(NOINHERIT)"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\..\engines\scumm\player_v4a.h"

Modified: scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj
===================================================================
--- scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj	2009-08-04 17:22:18 UTC (rev 43048)
+++ scummvm/branches/gsoc2009-mods/dists/msvc9/scummvm-tfmx.vcproj	2009-08-04 17:43:56 UTC (rev 43049)
@@ -1087,6 +1087,14 @@
 					RelativePath="..\..\sound\mods\tfmx.cpp"
 					>
 					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							DisableSpecificWarnings="$(NOINHERIT)"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
 						Name="Release|Win32"
 						>
 						<Tool

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-08-04 17:22:18 UTC (rev 43048)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-08-04 17:43:56 UTC (rev 43049)
@@ -41,7 +41,10 @@
 };
 
 SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer)
-	: Sound(vm, mixer), _driver(0), _musicHandle(), _fileLoaded(kFileNone) {
+	: Sound(vm, mixer),
+	  _driver(0),
+	  _musicHandle(),
+	  _fileLoaded(kFileNone) {
 }
 
 SoundAmiga::~SoundAmiga() {
@@ -51,7 +54,6 @@
 
 bool SoundAmiga::init() {
 	_driver = new Audio::MaxTrax(_mixer->getOutputRate(), true);
-
 	return _driver != 0;
 }
 

Modified: scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp	2009-08-04 17:22:18 UTC (rev 43048)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp	2009-08-04 17:43:56 UTC (rev 43049)
@@ -62,7 +62,9 @@
 			_tfmxSfx.setModuleData(_tfmxMusic);
 			return true;
 		}
-	}
+	} else
+		warning("player_v4a: couldnt load one of the music resources: music.dat, sample.dat");
+	
 	return false;
 }
 

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-04 17:22:18 UTC (rev 43048)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-04 17:43:56 UTC (rev 43049)
@@ -1003,7 +1003,7 @@
 	ChannelContext &channel = _channelCtx[channelNo];
 	unlockMacroChannel(channel);
 
-	noteCommand((uint8)note, (uint8)macro, (uint8)(relVol << 4) | channelNo, (uint8)finetune);
+	noteCommand((uint8)note, (uint8)macro, (uint8)((relVol << 4) | channelNo), (uint8)finetune);
 	startPaula();
 }
 


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