From a38828fbd53ac32051af47522ce45d148723b6bb Mon Sep 17 00:00:00 2001
From: James Brown
Date: Tue, 18 Jun 2002 08:38:39 +0000
Subject: Simon1 fixes, Readme update

svn-id: r4425
---
 simon/simon.cpp | 7 +++++++
 simon/simon.h   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'simon')

diff --git a/simon/simon.cpp b/simon/simon.cpp
index d9a94df0a9..b86c60b884 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -7258,6 +7258,9 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
 	uint m, n;
 	uint height;
 
+	if (num_1 >= 100) // FIXME: Simon1 Mine - Fix text for dwarf song
+		num_1 -= 100;
+
 	char_buf = print_str_buf;
 	string_ptr_3 = string_ptr_2 = string_ptr;
 
@@ -7495,6 +7498,10 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
 	if (!(_bit_array[8] & 0x20))
 		num_of_rows = 3;
 
+ 
+    if (threeval_b < 2) threeval_b = 2; // Fixme (pos): look at mine
+										// ladder, look at gorge, etc
+
 	if (!(_game & GAME_SIMON2)) {
 		start_vga_code(num_of_rows, 2, 199 + num_1, threeval_a >> 3, threeval_b, 12);
 	} else {
diff --git a/simon/simon.h b/simon/simon.h
index c379046e00..29e51e1532 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -79,7 +79,7 @@ struct Child3 {
 };
 
 struct ThreeValues {
-	uint16 a, b, c;
+	int16 a, b, c;
 };
 
 enum {
-- 
cgit v1.2.3