aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-01-27 13:33:21 +0000
committerTravis Howell2004-01-27 13:33:21 +0000
commit0b344350704c4a7ccb0010c643adc7ef3a2e1785 (patch)
treec2181a86a0d015e646bdebf13e878d204809a8e6 /simon
parent86d5cb7204c9afd378edce0cc83d0aa5d0697d25 (diff)
downloadscummvm-rg350-0b344350704c4a7ccb0010c643adc7ef3a2e1785.tar.gz
scummvm-rg350-0b344350704c4a7ccb0010c643adc7ef3a2e1785.tar.bz2
scummvm-rg350-0b344350704c4a7ccb0010c643adc7ef3a2e1785.zip
Avoid glitch if Simon1 introduction is skipped when showing Simon' room segment.
svn-id: r12633
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp2
-rw-r--r--simon/vga.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 1826365540..12723dd434 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2423,7 +2423,7 @@ void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
} else {
// Allow one section of Simon the Sorcerer 1 introduction to be displayed
// in lower half of screen
- if (_subroutine == 2926)
+ if (_subroutine == 2923 || _subroutine == 2926)
num_lines = 200;
else
num_lines = _video_palette_mode == 4 ? 134 : 200;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index f28fda3001..c1b7888187 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1776,7 +1776,7 @@ void SimonEngine::vc_62_palette_thing() {
// Allow one section of Simon the Sorcerer 1 introduction to be displayed
// in lower half of screen
- if (!(_game & GF_SIMON2) && _subroutine == 2926)
+ if (!(_game & GF_SIMON2) && (_subroutine == 2923 || _subroutine == 2926))
dx_clear_surfaces(200);
else
dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200);