aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-12-23 10:00:51 +0000
committerTravis Howell2003-12-23 10:00:51 +0000
commit2ab86ff62a37f9f4094c0b1fa64e19f1a3f315a9 (patch)
treebce982f8be6d374091e3f88a811d1baa2a716084 /simon
parent0727697db00b778cb4985b24d8a3848b10771597 (diff)
downloadscummvm-rg350-2ab86ff62a37f9f4094c0b1fa64e19f1a3f315a9.tar.gz
scummvm-rg350-2ab86ff62a37f9f4094c0b1fa64e19f1a3f315a9.tar.bz2
scummvm-rg350-2ab86ff62a37f9f4094c0b1fa64e19f1a3f315a9.zip
Fix inventory flashing when using F10 in Simon1 after conversation.
svn-id: r11873
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 7e61675d2a..775e88d7ff 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1859,6 +1859,7 @@ void SimonEngine::f10_key() {
else
color = 0xe1;
+ uint limit = (_game & GF_SIMON2) ? 200 : 134;
for (int i = 0; i < 5; i++) {
ha = _hit_areas;
@@ -1883,7 +1884,7 @@ void SimonEngine::f10_key() {
continue;
}
- if (ha->y >= 0xc8 || ha->y >= _vga_var8)
+ if (ha->y >= limit || ha->y >= _vga_var8)
continue;
y_ = (ha->height >> 1) - 4 + ha->y;
@@ -2420,7 +2421,6 @@ void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
num_lines = 200;
else
num_lines = _video_palette_mode == 4 ? 134 : 200;
- _vga_var8 = num_lines;
dx_copy_from_attached_to_2(0, 0, 320, num_lines);
dx_copy_from_attached_to_3(num_lines);
_sync_flag_2 = 1;