diff options
| author | James Brown | 2002-08-11 09:05:30 +0000 |
|---|---|---|
| committer | James Brown | 2002-08-11 09:05:30 +0000 |
| commit | 3ba577842b2f39742f383103b839f277d3422d9f (patch) | |
| tree | a61082ee4357f3efef31d906ecbde6092ee24cb0 /simon | |
| parent | 99e11501f4064d3966fe9eb3f0dffda1a046e7db (diff) | |
| download | scummvm-rg350-3ba577842b2f39742f383103b839f277d3422d9f.tar.gz scummvm-rg350-3ba577842b2f39742f383103b839f277d3422d9f.tar.bz2 scummvm-rg350-3ba577842b2f39742f383103b839f277d3422d9f.zip | |
Apply three patches:
593567 [painelf]: Fix SNM inventory icon centering, it's an actor
593444 [wjp and eriktorbjorn]: Simon2 lockup fix
593455 [wjp]: Simon2 map fix
svn-id: r4725
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/simonitems.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 39f8c7030e..645aec9092 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3432,8 +3432,10 @@ void SimonState::start_vga_code(uint b, uint vga_res, uint vga_struct_id, uint c _lock_word |= 0x40; - if (has_vgastruct_with_id(vga_struct_id, vga_res)) + if (has_vgastruct_with_id(vga_struct_id, vga_res)) { + _lock_word &= ~0x40; return; + } vsp = _vga_sprites; while (vsp->id != 0) diff --git a/simon/simonitems.cpp b/simon/simonitems.cpp index 82e76cf56a..90c0c7b0ee 100644 --- a/simon/simonitems.cpp +++ b/simon/simonitems.cpp @@ -1601,7 +1601,7 @@ void SimonState::o_unk_99_simon2(uint a, uint b) uint16 items[2]; items[0] = TO_BE_16(a); - items[1] = TO_BE_16(a); + items[1] = TO_BE_16(b); _lock_word |= 0x4000; _vc_ptr = (byte *)&items; |