diff options
| author | Paweł Kołodziejski | 2003-04-18 20:16:32 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-04-18 20:16:32 +0000 |
| commit | 3efe16ffceda4baca3c737d9530abcc4b980b5b3 (patch) | |
| tree | ac8a0a9b61b00267f75be66833e83ba35a2b6590 /scumm | |
| parent | 20e22e6f2954dd404a047fba8a51f9a67ee1b706 (diff) | |
| download | scummvm-rg350-3efe16ffceda4baca3c737d9530abcc4b980b5b3.tar.gz scummvm-rg350-3efe16ffceda4baca3c737d9530abcc4b980b5b3.tar.bz2 scummvm-rg350-3efe16ffceda4baca3c737d9530abcc4b980b5b3.zip | |
loom ega: build custom cursor, op_wait() has more then one subopcodes(revert changes), disabled adlib_default
svn-id: r7017
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 7496b46690..f8a6aa222b 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -3275,7 +3275,7 @@ void Scumm::decompressDefaultCursor(int idx) { // FIXME: None of the stock cursors are right for Loom. Why is that? - if (_gameId == GID_LOOM256) { + if ((_gameId == GID_LOOM256) || (_gameId == GID_LOOM)) { int w; _cursor.width = 8; diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index f92df12306..2169e844f5 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2252,7 +2252,7 @@ void Scumm_v5::o5_wait() { oldaddr = _scriptPointer - 1; - if ((_gameId == GID_INDY3_256) || (_features & GF_OLD_BUNDLE)) { + if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) { _opcode = 2; } else _opcode = fetchScriptByte(); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index b839b28017..b2b809937b 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -73,7 +73,7 @@ static const VersionSettings scumm_settings[] = { {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, 0, 0, GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_AUDIOTRACKS, "00.LFL"}, {"loom", "Loom", GID_LOOM, 3, 5, 40, - GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_OLD_BUNDLE | GF_16COLOR | GF_ADLIB_DEFAULT, "00.LFL"}, + GF_AFTER_V3 | GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, /* Scumm Version 4 */ {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, 0, 62, |