diff options
| author | Travis Howell | 2005-03-15 01:19:36 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-03-15 01:19:36 +0000 |
| commit | 7bb8de561b9b0e114daaff12b615b2f947e757df (patch) | |
| tree | e30d10d02e277580e5ca5c3ad2de544ebcefbad6 | |
| parent | ef57db4105d737a5f97f107aef32aed302fa53d2 (diff) | |
| download | scummvm-rg350-7bb8de561b9b0e114daaff12b615b2f947e757df.tar.gz scummvm-rg350-7bb8de561b9b0e114daaff12b615b2f947e757df.tar.bz2 scummvm-rg350-7bb8de561b9b0e114daaff12b615b2f947e757df.zip | |
Off by one.
svn-id: r17138
| -rw-r--r-- | scumm/costume.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 057b6ae1eb..f181b518df 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -855,7 +855,7 @@ void ScummEngine::cost_decodeNESCostumeGfx() { byte *patTable = getResourceAddress(rtCostume, v1MMNEScostTables[n][4]); int j = 0; int i = 3; - int maxSprites = 256; //patTable[3]; + int maxSprites = 257; //patTable[3]; int len = READ_LE_UINT16(patTable); if (maxSprites == 0) diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 716dc415ae..1b531331f5 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1583,7 +1583,7 @@ void ScummEngine::setupMusic(int midi) { _musicEngine = new Player_V2A(this); } else if ((_features & GF_AMIGA) && (_version == 3)) { _musicEngine = new Player_V3A(this); - } else if ((_features & GF_AMIGA) && (_version < 5)) { + } else if (((_features & GF_AMIGA) && (_version < 5)) || (_features & GF_NES)) { _musicEngine = NULL; } else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) { _musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK); |