Simon1 fixes, Readme update

svn-id: r4425

3 files changed, 27 insertions, 9 deletions

diff --git a/readme.txt b/readme.txt
index a4a06b4fce..5b46f87353 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 ScummVM README
-Last updated:    2002-05-13
-Release version: 0.2.0 [Release]
+Last updated:    2002-06-18
+Release version: 0.2.2 [CVS]
 ------------------------------------------------------------------------
 
 For more information, compatibility lists, details on donating, the latest
@@ -160,6 +160,10 @@ Visual C++ are supported. If you wish to use MP3-compressed CD tracks or
 COMPRESSED_SOUND_FILE. Tools for compressing .SOU files to .SO3 files can be
 found in the 'tools' CVS module, or in the 'scummvm-tools' package.
 
+You can also comment/uncomment appropriate lines in the Makefile to use
+sdl_gl.cpp instead of sdl.cpp. This allows hardware accelerated bilinear
+filtering by using OpenGL textures.
+
 On Win9x/NT/XP you can define USE_WINDBG and attach WinDbg to browse debug 
 messages (see http://www.sysinternals.com/ntw2k/freeware/debugview.shtml).
 
@@ -279,13 +283,17 @@ Note that filters are very slow when ScummVM is compiled in a debug
 configuration without optimizations. And there is always a speed impact when
 using any form of anti-aliasing/linear filtering.
 
+The alternative is to try using the SDL_gl.cpp target. This will allow you to
+use hardware accelerated functions, like bilinear filtering and FSAA, on
+suitable OpenGL capable cards.
 
 Autosaves:
 ----------
 
 Because ScummVM is still a beta product, it -can- crash and/or hang
 occasionally. As such, every five minutes it will save a game in Slot 0. This
-game can be loaded via Ctrl-0, or the F5 menu.
+game can be loaded via Ctrl-0, or the F5 menu. This autosaving only applies to
+Scumm games, not other games (such as Simon the Sorcerer)
 
 
 Savegames:
@@ -341,7 +349,8 @@ many soundcards will not play MIDI under Linux). We have recently added an
 'emulated MIDI' technology. It can be accessed using the 'midiemu' option,
 and is the default for Sam and Max on UNIX platforms. -HOWEVER-, it is still
 very buggy and the emulation is not perfect. If you are capable of using
-native midi, we recommend using one of the MIDI modes below.
+native midi, we recommend using one of the MIDI modes below, or Adlib if
+your game includes music in the appropriate format.
 
 
 Playing sound with Native MIDI:
@@ -479,15 +488,15 @@ An example config file is as follows:
 Credits:
 --------
   The core ScummVM team:
-        Ludvig Strigeus    - Original developer, lead developer 'simon' module
-        Vincent Hamm       - Current lead developer, ScummVM
-        James Brown        - Co-lead developer, ScummVM
+        James Brown        - Current lead developer, ScummVM
+        Vincent Hamm       - Co-lead developer, ScummVM (inactive)
         Jeremy Newman      - Webmaster
+        Ludvig Strigeus    - Original developer, Scumm and SimonVM. (Retired)
 
  Porters:
         Lionel Ulmer       - X11/Linux port
         Nicolas Bacca      - PocketPC/WinCE port
-        Mutwin Kraus       - Macintosh port
+        Mutwin Kraus       - Macintosh port (Retired)
         Max Horn           - Macintosh port, many bug fixes
         Marcus Comstedt    - Dreamcast port
         Ruediger Hanke     - MorphOS port
@@ -505,6 +514,8 @@ Credits:
         Nicolas Noble      - Config file and ALSA support
         Pawel Kolodziejski - Added missing Dig SMUSH codecs
         Felix Jakschitsc   - His hard work on Zak256
+        Andr‚ Souza        - SDL-based OpenGL renderer
+        Kov cs Endre J nos - Several fixes for Simon1
 
         And to all the contributors, users, and beta testers we've missed.
         Thanks!
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 {