diff options
| author | Jonathan Gray | 2004-06-25 10:58:47 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2004-06-25 10:58:47 +0000 |
| commit | bdba2baa18c69ec126f08a0b7abe750feda1bd92 (patch) | |
| tree | e7d96ba160ce8c71ee9cc58c669a24b5505c2027 | |
| parent | 28b1c628aa28969ba5ba077576961f0be6567f25 (diff) | |
| download | scummvm-rg350-bdba2baa18c69ec126f08a0b7abe750feda1bd92.tar.gz scummvm-rg350-bdba2baa18c69ec126f08a0b7abe750feda1bd92.tar.bz2 scummvm-rg350-bdba2baa18c69ec126f08a0b7abe750feda1bd92.zip | |
Display error based on the version a game is believed to be when reading MAXS block. Note additional C++ engine based version of spydemo.
svn-id: r14044
| -rw-r--r-- | scumm/resource.cpp | 10 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 32de5d9057..be5b745508 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -2091,8 +2091,14 @@ void ScummEngine::readMAXS(int blockSize) { _shadowPaletteSize = NUM_SHADOW_PALETTE * 256; } else if (_heversion >= 72) { // sputm7.2 - if (blockSize != 32 + 8) - error("MAXS block of size %d not supported", blockSize); + if (blockSize != 32 + 8) { + if (blockSize == 44 + 8) + error("MAXS blocks from C++ based games not yet supported"); + else if (blockSize == 38 + 8) + error("MAXS blocks from Scummsys.9x games not yet supported"); + else + error("MAXS block of size %d not supported, please report", blockSize); + } _fileHandle.readUint16LE(); _numVariables = _fileHandle.readUint16LE(); _numBitVariables = _fileHandle.readUint16LE(); diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 5ac49d56b7..c29551b14e 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -253,9 +253,6 @@ static const ScummGameSettings scumm_settings[] = { {"socks", "Pajama Sam's Sock Works", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, - //Not checked - {"ffhsdemo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_HEGAME, 6, 72, MDT_NONE, - GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, // Resource changed {"pajama", "Pajama Sam 1: No Need to Hide When It's Dark Outside", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, @@ -273,6 +270,7 @@ static const ScummGameSettings scumm_settings[] = { GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, {"foxdemo", "Spyfox 1: Dry Cereal (Demo)", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, + /* there is also a C++ engine version of spydemo */ {"spydemo", "Spyfox 1: Dry Cereal (Demo)", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, @@ -312,6 +310,8 @@ static const ScummGameSettings scumm_settings[] = { GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, {"freddicove", "Freddi Fish 5: The Case of the Creature of Coral Cave", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, + {"ffhsdemo", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Demo)", GID_HEGAME, 6, 72, MDT_NONE, + GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, {"pj3-demo", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Demo)", GID_HEGAME, 6, 72, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0}, {"pajama3", "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet", GID_HEGAME, 6, 72, MDT_NONE, |