From 394bb952c560a7e433a77f59fff400afde61b970 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 26 Oct 2003 04:03:51 +0000
Subject: Update issues

svn-id: r10968
---
 simon/charset.cpp | 10 +++++-----
 simon/simon.cpp   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'simon')

diff --git a/simon/charset.cpp b/simon/charset.cpp
index 9d5eba1f69..a026235a3b 100644
--- a/simon/charset.cpp
+++ b/simon/charset.cpp
@@ -61,23 +61,23 @@ void SimonEngine::print_char_helper_6(uint i) {
 	}
 }
 
-void SimonEngine::render_string(uint vga_struct_id, uint color, uint width, uint height, const char *txt) {
+void SimonEngine::render_string(uint vga_sprite_id, uint color, uint width, uint height, const char *txt) {
 	VgaPointersEntry *vpe = &_vga_buffer_pointers[2];
 	byte *src, *dst, *p, *dst_org, chr;
 	uint count;
 
-	if (vga_struct_id >= 100) {
-		vga_struct_id -= 100;
+	if (vga_sprite_id >= 100) {
+		vga_sprite_id -= 100;
 		vpe++;
 	}
 
 	src = dst = vpe->vgaFile2;
 
 	count = 4000;
-	if (vga_struct_id == 1)
+	if (vga_sprite_id == 1)
 		count *= 2;
 
-	p = dst + vga_struct_id * 8;
+	p = dst + vga_sprite_id * 8;
 
 	*(uint16 *)(p + 4) = TO_BE_16(height);
 	*(uint16 *)(p + 6) = TO_BE_16(width);
diff --git a/simon/simon.cpp b/simon/simon.cpp
index cadb3e8b63..791a7e44a2 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4015,8 +4015,8 @@ void SimonEngine::talk_with_text(uint vga_sprite_id, uint color, const char *str
 	uint m, n;
 	uint height;
 
-	// FIXME: Simon1dos Dwarf Mine - Fix text for dwarf song
-	if (vga_sprite_id >= 100)
+	// FIXME: Shows Dwarf Song subtitles in Dwarf Mine under simon1dos/simon1talkie
+	if ((_game == GAME_SIMON1DOS) && (vga_sprite_id >= 100))
 		vga_sprite_id -= 100;
 
 	char_buf = print_str_buf;
-- 
cgit v1.2.3