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

[m_kiewitz at users.sourceforge.net]

Revision: 51329
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51329&view=rev
Author:   m_kiewitz
Date:     2010-07-26 18:40:49 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
SCI: reverting r51304, broke kq6 hires

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel_tables.h
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/workarounds.cpp
    scummvm/trunk/engines/sci/engine/workarounds.h

Modified: scummvm/trunk/engines/sci/engine/kernel_tables.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 18:18:25 UTC (rev 51328)
+++ scummvm/trunk/engines/sci/engine/kernel_tables.h	2010-07-26 18:40:49 UTC (rev 51329)
@@ -332,7 +332,7 @@
     { MAP_CALL(DoBresen),          SIG_EVERYWHERE,           "o",                     NULL,            NULL },
     { MAP_CALL(DoSound),           SIG_EVERYWHERE,           "i(.*)",                 kDoSound_subops, NULL },
     { MAP_CALL(DoSync),            SIG_EVERYWHERE,           "i(.*)",                 NULL,            NULL }, // subop
-    { MAP_CALL(DrawCel),           SIG_SCI11, SIGFOR_PC,     "iiiii(i)(i)(r0)",       NULL,            kDrawCel_workarounds }, // for kq6 hires and qfg4 demo
+    { MAP_CALL(DrawCel),           SIG_SCI11, SIGFOR_PC,     "iiiii(i)(i)(r0)",       NULL,            NULL }, // for kq6 hires
     { MAP_CALL(DrawCel),           SIG_EVERYWHERE,           "iiiii(i)(i)",           NULL,            NULL },
     { MAP_CALL(DrawControl),       SIG_EVERYWHERE,           "o",                     NULL,            NULL },
     { MAP_CALL(DrawMenuBar),       SIG_EVERYWHERE,           "i",                     NULL,            NULL },

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-26 18:18:25 UTC (rev 51328)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-07-26 18:40:49 UTC (rev 51329)
@@ -1000,9 +1000,8 @@
 	uint16 y = argv[4].toUint16();
 	int16 priority = (argc > 5) ? argv[5].toSint16() : -1;
 	uint16 paletteNo = (argc > 6) ? argv[6].toUint16() : 0;
-	// QFG4 demo calls this with an extra integer parameter (room 22, when Dr. Cranium speaks)
-	bool hiresMode = (argc > 7 && argv[6].segment != 0) ? true : false;
-	reg_t upscaledHiresHandle = (argc > 7 && argv[6].segment != 0) ? argv[7] : NULL_REG;
+	bool hiresMode = (argc > 7) ? true : false;
+	reg_t upscaledHiresHandle = (argc > 7) ? argv[7] : NULL_REG;
 
 	g_sci->_gfxPaint16->kernelDrawCel(viewId, loopNo, celNo, x, y, priority, paletteNo, hiresMode, upscaledHiresHandle);
 

Modified: scummvm/trunk/engines/sci/engine/workarounds.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 18:18:25 UTC (rev 51328)
+++ scummvm/trunk/engines/sci/engine/workarounds.cpp	2010-07-26 18:40:49 UTC (rev 51329)
@@ -112,12 +112,6 @@
 };
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
-const SciWorkaroundEntry kDrawCel_workarounds[] = {
-	{ GID_QFG4,           371,   22,  0,        "GloryWindow", "<noname 196>",   -1,    0, { WORKAROUND_STILLCALL, 0 } }, // when Dr. Cranium talks, gets called with 1 extra parameter
-    SCI_WORKAROUNDENTRY_TERMINATOR
-};
-
-//    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kDisplay_workarounds[] = {
     { GID_ISLANDBRAIN,   300,   300,  0,           "geneDude", "show",           -1,    0, { WORKAROUND_IGNORE,    0 } }, // when looking at the gene explanation chart - a parameter is an object
     { GID_SQ4,           391,   391,  0,          "doCatalog", "mode",         0x84,    0, { WORKAROUND_IGNORE,    0 } }, // clicking on catalog in roboter sale - a parameter is an object

Modified: scummvm/trunk/engines/sci/engine/workarounds.h
===================================================================
--- scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 18:18:25 UTC (rev 51328)
+++ scummvm/trunk/engines/sci/engine/workarounds.h	2010-07-26 18:40:49 UTC (rev 51329)
@@ -73,7 +73,6 @@
 extern const SciWorkaroundEntry opcodeDptoaWorkarounds[];
 extern const SciWorkaroundEntry uninitializedReadWorkarounds[];
 extern const SciWorkaroundEntry kAbs_workarounds[];
-extern const SciWorkaroundEntry kDrawCel_workarounds[];
 extern const SciWorkaroundEntry kDisplay_workarounds[];
 extern const SciWorkaroundEntry kDisposeScript_workarounds[];
 extern const SciWorkaroundEntry kDoSoundFade_workarounds[];


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