libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r43049
This commit is contained in:
Norbert Lange 2009-08-04 17:43:56 +00:00
parent c304c633ce
commit 4c4eb1394c
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dists/msvc9/scumm.vcproj
View File

@ -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"

8
dists/msvc9/scummvm-tfmx.vcproj
View File

@ -1086,6 +1086,14 @@
<File
RelativePath="..\..\sound\mods\tfmx.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
DisableSpecificWarnings="$(NOINHERIT)"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>

6
engines/kyra/sound_amiga.cpp
View File

@ -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;
}

4
engines/scumm/player_v4a.cpp
View File

@ -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;
}

2
sound/mods/tfmx.cpp
View File

@ -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();
}