[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.384,1.385

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv12909/simon

Modified Files:
	simon.cpp 
Log Message:

Add correction solution for missing song in dwarf mines of Simon1.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- simon.cpp	20 Dec 2003 08:23:31 -0000	1.384
+++ simon.cpp	20 Dec 2003 09:05:25 -0000	1.385
@@ -3979,7 +3979,11 @@
 	vsp->image = 0;
 	vsp->base_color = base_color;
 	vsp->id = vga_sprite_id;
-	vsp->unk7 = vga_res;
+	if (!(_game & GF_SIMON2) &!(_game & GF_TALKIE))
+		vsp->unk7 = vga_res = vga_sprite_id / 100;
+	else
+		vsp->unk7 = vga_res;
+
 
 	for (;;) {
 		vpe = &_vga_buffer_pointers[vga_res];
@@ -4067,10 +4071,6 @@
 	uint letters_per_row, len_div_3, num_of_rows;
 	uint m, n;
 	uint height;
-
-	// FIXME: Shows Dwarf Song subtitles in Dwarf Mine under simon1dos
-	if (!(_game & GF_SIMON2) && !(_game & GF_TALKIE) && (vga_sprite_id >= 100))
-		vga_sprite_id -= 100;
 
 	char_buf = print_str_buf;
 	string_ptr_3 = string_ptr_2 = string_ptr;