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

[m_kiewitz at users.sourceforge.net]

Revision: 50785
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50785&view=rev
Author:   m_kiewitz
Date:     2010-07-10 17:08:42 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
SCI: allow invalid handles in kDisplay calls, fixes pq3 intro signature mismatch

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-10 16:22:08 UTC (rev 50784)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-07-10 17:08:42 UTC (rev 50785)
@@ -370,7 +370,8 @@
     { MAP_CALL(CosDiv),            SIG_EVERYWHERE,           "ii",                    NULL,            NULL },
     { MAP_CALL(DeleteKey),         SIG_EVERYWHERE,           "l.",                    NULL,            NULL },
     { MAP_CALL(DeviceInfo),        SIG_EVERYWHERE,           "i(r)(r)(i)",            NULL,            NULL }, // subop
-    { MAP_CALL(Display),           SIG_EVERYWHERE,           "[ir]([ir]*)",           NULL,            NULL }, // subop
+    { MAP_CALL(Display),           SIG_EVERYWHERE,           "[ir]([ir!]*)",          NULL,            NULL },
+	// ^ we allow invalid references here, because kDisplay gets called with those in e.g. pq3 during intro
     { MAP_CALL(DirLoop),           SIG_EVERYWHERE,           "oi",                    NULL,            NULL },
     { MAP_CALL(DisposeClone),      SIG_EVERYWHERE,           "o",                     NULL,            NULL },
     { MAP_CALL(DisposeList),       SIG_EVERYWHERE,           "l",                     NULL,            NULL },


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