[Scummvm-cvs-logs] SF.net SVN: scummvm:[50016] scummvm/trunk/engines/sci/graphics/paint16.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50016
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50016&view=rev
Author:   m_kiewitz
Date:     2010-06-18 13:02:48 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
SCI: pseudo-implemented 0x72 and 0x73 for kDisplay used by longbow-demo, although sierra sci doesn't support them at all

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/paint16.cpp

Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-18 12:15:33 UTC (rev 50015)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-18 13:02:48 UTC (rev 50016)
@@ -448,6 +448,8 @@
 #define SCI_DISPLAY_WIDTH				106
 #define SCI_DISPLAY_SAVEUNDER			107
 #define SCI_DISPLAY_RESTOREUNDER		108
+#define SCI_DISPLAY_DUMMY1				114 // used in longbow-demo, not supported in sierra sci - no parameters
+#define SCI_DISPLAY_DUMMY2				115 // used in longbow-demo, not supported in sierra sci - has 1 parameter
 #define SCI_DISPLAY_DONTSHOWBITS		121
 
 reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
@@ -513,8 +515,22 @@
 		case SCI_DISPLAY_DONTSHOWBITS:
 			bRedraw = 0;
 			break;
+
+		// 2 Dummy functions, longbow-demo is using those several times but sierra sci doesn't support them at all
+		case SCI_DISPLAY_DUMMY1:
+		case SCI_DISPLAY_DUMMY2:
+			if (!((g_sci->getGameId() == "longbow") && (g_sci->isDemo())))
+				error("Unknown kDisplay argument %X", displayArg);
+			if (displayArg == SCI_DISPLAY_DUMMY2) {
+				if (argc) {
+					argc--; argv++;
+				} else {
+					error("No parameter left for kDisplay(0x73)");
+				}
+			}
+			break;
 		default:
-			warning("Unknown kDisplay argument %X", displayArg);
+			error("Unknown kDisplay argument %X", displayArg);
 			break;
 		}
 	}


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