thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AGOS: Add Simon 1 invalid AdLib errors

Browse source 
This adds error messages in case the Simon 1 AdLib instrument bank file is
missing or invalid.
This commit is contained in:
Coen Rampen 2022-06-05 14:31:48 +02:00
parent 42a5a8a6b0
commit b12feb2ae9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/agos/drivers/simon1/adlib.cpp
View file

@ -304,19 +304,19 @@ MidiDriver_Multisource *createMidiDriverSimon1AdLib(const char *instrumentFilena
Common::File ibk;
if (!ibk.open(instrumentFilename)) {
return nullptr;
error("MidiDriver_Simon1_AdLib::createMidiDriverSimon1AdLib - Could not find AdLib instrument bank file %s", instrumentFilename);
}
// Check for the expected FourCC (IBK\x1A)
if (ibk.readUint32BE() != 0x49424b1a) {
return nullptr;
error("MidiDriver_Simon1_AdLib::createMidiDriverSimon1AdLib - Invalid AdLib instrument bank file %s", instrumentFilename);
}
byte *instrumentData = new byte[128 * 16];
if (ibk.read(instrumentData, 128 * 16) != 128 * 16) {
// Failed to read the expected amount of data.
delete[] instrumentData;
return nullptr;
error("MidiDriver_Simon1_AdLib::createMidiDriverSimon1AdLib - Unexpected AdLib instrument bank file %s size", instrumentFilename);
}
MidiDriver_Simon1_AdLib *driver = new MidiDriver_Simon1_AdLib(oplType, instrumentData);