diff options
| -rw-r--r-- | dists/msvc9/scumm.vcproj | 8 | ||||
| -rw-r--r-- | dists/msvc9/scummvm-tfmx.vcproj | 8 | ||||
| -rw-r--r-- | engines/kyra/sound_amiga.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/player_v4a.cpp | 4 | ||||
| -rw-r--r-- | sound/mods/tfmx.cpp | 2 |
5 files changed, 24 insertions, 4 deletions
diff --git a/dists/msvc9/scumm.vcproj b/dists/msvc9/scumm.vcproj index 9176461d8c..3633e53b78 100644 --- a/dists/msvc9/scumm.vcproj +++ b/dists/msvc9/scumm.vcproj @@ -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" diff --git a/dists/msvc9/scummvm-tfmx.vcproj b/dists/msvc9/scummvm-tfmx.vcproj index 3133b86002..6599b04db4 100644 --- a/dists/msvc9/scummvm-tfmx.vcproj +++ b/dists/msvc9/scummvm-tfmx.vcproj @@ -1087,6 +1087,14 @@ RelativePath="..\..\sound\mods\tfmx.cpp" > <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + DisableSpecificWarnings="$(NOINHERIT)" + /> + </FileConfiguration> + <FileConfiguration Name="Release|Win32" > <Tool diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 59f1eaf4cd..329969eff0 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -41,7 +41,10 @@ const char *const SoundAmiga::kFilenameTable[3][2] = { }; 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 @@ SoundAmiga::~SoundAmiga() { bool SoundAmiga::init() { _driver = new Audio::MaxTrax(_mixer->getOutputRate(), true); - return _driver != 0; } diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player_v4a.cpp index 48e466cd38..6a197f30b6 100644 --- a/engines/scumm/player_v4a.cpp +++ b/engines/scumm/player_v4a.cpp @@ -62,7 +62,9 @@ bool Player_V4A::init() { _tfmxSfx.setModuleData(_tfmxMusic); return true; } - } + } else + warning("player_v4a: couldnt load one of the music resources: music.dat, sample.dat"); + return false; } diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp index 9d5495d402..4886904115 100644 --- a/sound/mods/tfmx.cpp +++ b/sound/mods/tfmx.cpp @@ -1003,7 +1003,7 @@ void Tfmx::doMacro(int note, int macro, int relVol, int finetune, int channelNo) 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(); } |