From 2ab86ff62a37f9f4094c0b1fa64e19f1a3f315a9 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 23 Dec 2003 10:00:51 +0000
Subject: Fix inventory flashing when using F10 in Simon1 after conversation.

svn-id: r11873
---
 simon/simon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'simon')

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;
-- 
cgit v1.2.3