aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-08-10 15:49:06 +0000
committerTravis Howell2003-08-10 15:49:06 +0000
commit5d972a657b7d9f68298563cc6914479ede875e5f (patch)
treebcb5faea9309e969813f050cc19862cc12278e5c /simon
parent3678fd6106a25aabb94df6e3da1107a3fec2523a (diff)
downloadscummvm-rg350-5d972a657b7d9f68298563cc6914479ede875e5f.tar.gz
scummvm-rg350-5d972a657b7d9f68298563cc6914479ede875e5f.tar.bz2
scummvm-rg350-5d972a657b7d9f68298563cc6914479ede875e5f.zip
Fix for f10 key in simon1
svn-id: r9624
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 2e7bfefbb9..bee77ecc35 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1763,10 +1763,8 @@ void SimonEngine::f10_key() {
do {
if (ha->id != 0 && ha->flags & 0x20 && !(ha->flags & 0x40)) {
- /* XXX: add code to skip inventory and verbs area */
-
- if (ha->y >= 0xc8)
- continue;
+ if (ha->y >= 0xc8 || ha->y >= _vga_var8)
+ continue;
y_ = (ha->height >> 1) - 4 + ha->y;
@@ -2321,6 +2319,7 @@ void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
_dx_use_3_or_4_for_lock = false;
} else {
uint 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;