[Scummvm-cvs-logs] SF.net SVN: scummvm:[48066] scummvm/trunk/engines/sci/engine/kstring.cpp

[mthreepwood at users.sourceforge.net]

Revision: 48066
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48066&view=rev
Author:   mthreepwood
Date:     2010-02-15 17:10:40 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
SCI32 reorders the REF* subops in kMessage; fixes GK1 conversations.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kstring.cpp

Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp	2010-02-15 10:01:26 UTC (rev 48065)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp	2010-02-15 17:10:40 UTC (rev 48066)
@@ -475,10 +475,16 @@
 #ifdef ENABLE_SCI32
 	if (getSciVersion() >= SCI_VERSION_2) {
 		// In complete weirdness, SCI32 bumps up subops 3-8 to 4-9 and stubs off subop 3.
+		// In addition, SCI32 reorders the REF* subops.
 		if (func == 3)
-			warning("SCI32 kMessage(3)");
-		else if (func > 3)
+			error("SCI32 kMessage(3)");
+		else if (func > 3) {
 			func--;
+			if (func == K_MESSAGE_REFCOND)
+				func = K_MESSAGE_REFNOUN;
+			else if (func == K_MESSAGE_REFNOUN || func == K_MESSAGE_REFVERB)
+				func--;
+		}
 	}
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.