diff options
| author | Travis Howell | 2003-05-24 07:55:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-05-24 07:55:53 +0000 |
| commit | 3fbae51dc06d60e453fa90b79c0af8eb983bc5c9 (patch) | |
| tree | 9ca1728853c4cc479b498887048d3c1c42ed6e6a /simon/simon.cpp | |
| parent | bc5511c51447f5d1122adc0016aa8d8bced73ea6 (diff) | |
| download | scummvm-rg350-3fbae51dc06d60e453fa90b79c0af8eb983bc5c9.tar.gz scummvm-rg350-3fbae51dc06d60e453fa90b79c0af8eb983bc5c9.tar.bz2 scummvm-rg350-3fbae51dc06d60e453fa90b79c0af8eb983bc5c9.zip | |
Small cleanup
svn-id: r7879
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 10766d2d88..3c6462d26e 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3631,10 +3631,10 @@ void SimonState::draw_icon_c(FillOrCopyStruct *fcs, uint icon, uint x, uint y) { byte *dst; byte *src; - if (!(_game & GF_SIMON2)) { - _lock_word |= 0x8000; + _lock_word |= 0x8000; + dst = dx_lock_2(); - dst = dx_lock_2(); + if (!(_game & GF_SIMON2)) { dst += (x + fcs->x) * 8; dst += (y * 25 + fcs->y) * _dx_surface_pitch; @@ -3642,13 +3642,7 @@ void SimonState::draw_icon_c(FillOrCopyStruct *fcs, uint icon, uint x, uint y) { src += READ_LE_UINT16(&((uint16 *)src)[icon]); decompress_icon(dst, src, 24, 12, 0xE0, _dx_surface_pitch); - - dx_unlock_2(); - _lock_word &= ~0x8000; } else { - _lock_word |= 0x8000; - dst = dx_lock_2(); - dst += 110; dst += x; dst += (y + fcs->y) * _dx_surface_pitch; @@ -3660,10 +3654,10 @@ void SimonState::draw_icon_c(FillOrCopyStruct *fcs, uint icon, uint x, uint y) { src = _icon_file_ptr; src += READ_LE_UINT16(&((uint16 *)src)[icon * 2 + 1]); decompress_icon(dst, src, 20, 10, 0xD0, _dx_surface_pitch); - - dx_unlock_2(); - _lock_word &= ~0x8000; } + + dx_unlock_2(); + _lock_word &= ~0x8000; } void SimonState::video_toggle_colors(HitArea * ha, byte a, byte b, byte c, byte d) { |