aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNorbert Lange2009-08-04 17:43:56 +0000
committerNorbert Lange2009-08-04 17:43:56 +0000
commit4c4eb1394cf195952b59e7e06963736df41eeb5f (patch)
tree7916db9e811ec030d02091c372454c00ec5255ff /engines
parentc304c633cecce91b2cc6d71224960681a7a04707 (diff)
downloadscummvm-rg350-4c4eb1394cf195952b59e7e06963736df41eeb5f.tar.gz
scummvm-rg350-4c4eb1394cf195952b59e7e06963736df41eeb5f.tar.bz2
scummvm-rg350-4c4eb1394cf195952b59e7e06963736df41eeb5f.zip
added warning should the sound files not be available (intro will hang if there is no musictimer)
svn-id: r43049
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/sound_amiga.cpp6
-rw-r--r--engines/scumm/player_v4a.cpp4
2 files changed, 7 insertions, 3 deletions
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;
}