[Scummvm-cvs-logs] scummvm master -> 6d05012bda9fe3529209a6584db14d9942972043

bluegr md5 at scummvm.org
Fri Apr 29 02:08:52 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6d05012bda SCI: Fixed bug #3289744 - "Hero Quest 1 demo crashes"


Commit: 6d05012bda9fe3529209a6584db14d9942972043
    https://github.com/scummvm/scummvm/commit/6d05012bda9fe3529209a6584db14d9942972043
Author: md5 (md5 at scummvm.org)
Date: 2011-04-28T17:06:15-07:00

Commit Message:
SCI: Fixed bug #3289744 - "Hero Quest 1 demo crashes"

Changed paths:
    engines/sci/graphics/paint16.cpp



diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index cba2868..bb23fb8 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -467,6 +467,7 @@ void GfxPaint16::kernelGraphRedrawBox(Common::Rect rect) {
 #define SCI_DISPLAY_RESTOREUNDER		108
 #define SCI_DISPLAY_DUMMY1				114 // used in longbow demo/qfg1 ega 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_DUMMY3				117 // used in qfg1 ega demo, not supported in sierra sci - no parameters
 #define SCI_DISPLAY_DONTSHOWBITS		121
 
 reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
@@ -537,9 +538,10 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
 			break;
 
 		// 2 Dummy functions, longbow-demo is using those several times but sierra sci doesn't support them at all
-		// The Quest for Glory 1 EGA demo also calls kDisplay(114)
+		// The Quest for Glory 1 EGA demo also calls kDisplay(114) and kDisplay(117)
 		case SCI_DISPLAY_DUMMY1:
 		case SCI_DISPLAY_DUMMY2:
+		case SCI_DISPLAY_DUMMY3:
 			if (!g_sci->isDemo() || (g_sci->getGameId() != GID_LONGBOW && g_sci->getGameId() != GID_QFG1))
 				error("Unknown kDisplay argument %d", displayArg.offset);
 			if (displayArg.offset == SCI_DISPLAY_DUMMY2) {






More information about the Scummvm-git-logs mailing list