Ticket #9021: kq1_demo_fix_updated.diff

sci.cpp

@@ -204 +204 @@
 
                 if (gamestate->flags & GF_SCI0_OLD ||
                         gamestate->flags & GF_SCI0_OLDGFXFUNCS ||
-                        gamestate->flags & GF_SCI0_OLDGETTIME) {
+                        gamestate->flags & GF_SCI0_OLDGETTIME ||
+                        gamestate->flags & GF_SCI0_NEWVOCAB) {
                         error("This game entry is erroneous. It's marked as SCI1, but it has SCI0 flags set");
                 }
         } else if (version == SCI_VERSION_1_1 || version == SCI_VERSION_32) {
@@ -217 +218 @@
 
                 if (gamestate->flags & GF_SCI0_OLD ||
                         gamestate->flags & GF_SCI0_OLDGFXFUNCS ||
-                        gamestate->flags & GF_SCI0_OLDGETTIME) {
+                        gamestate->flags & GF_SCI0_OLDGETTIME ||
+                        gamestate->flags & GF_SCI0_NEWVOCAB) {
                         error("This game entry is erroneous. It's marked as SCI1.1/SCI32, but it has SCI0 flags set");
                 }
 

detection.cpp

@@ -950 +950 @@
                 {"resource.map", 0, "59b13619078bd47011421468959ee5d4", 954},
                 {"resource.001", 0, "4cfb9040db152868f7cb6a1e8151c910", 296555},
                 {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO},
-                0,
+                GF_SCI0_NEWVOCAB,
                 SCI_VERSION_AUTODETECT,
-                SCI_VERSION_01
+                SCI_VERSION_0
         },
 
         // King's Quest 1 SCI Remake - English DOS (from the King's Quest Collection)
@@ -991 +991 @@
                 {"resource.map", 0, "992ac7cc31d3717fe53818a9bb6d1dae", 594},
                 {"resource.001", 0, "143e1c14f15ad0fbfc714f648a65f661", 205330},
                 {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO},
-                GF_FOR_SCI0_BEFORE_629,
+                GF_FOR_SCI0_BEFORE_502,
                 SCI_VERSION_AUTODETECT,
                 SCI_VERSION_0
         },

sci.h

@@ -105 +105 @@
         ** Older SCI versions had simpler code for GetTime()
         */
         GF_SCI0_OLDGETTIME              = (1 << 2),
+        
+        /* Applies to the King's Quest I Demo
+        ** This requires the SCI1 vocabulary, but everything else is close to SCI0.
+        */
+        GF_SCI0_NEWVOCAB                = (1 << 3),
 
         // ----------------------------------------------------------------------------
 
@@ -115 +120 @@
         /*
         ** Used to distinguish SCI1 EGA games
         */
-        GF_SCI1_EGA                             = (1 << 3),
+        GF_SCI1_EGA                             = (1 << 4),
 
         /* Applies to all SCI1 versions after 1.000.200
     ** In late SCI1 versions, the argument of lofs[as] instructions
         ** is absolute rather than relative.
         */
-        GF_SCI1_LOFSABSOLUTE    = (1 << 4),
+        GF_SCI1_LOFSABSOLUTE    = (1 << 5),
 
         /* Applies to all versions from 1.000.510 onwards
         ** kDoSound() is different than in earlier SCI1 versions.
         */
-        GF_SCI1_NEWDOSOUND              = (1 << 5),
+        GF_SCI1_NEWDOSOUND              = (1 << 6),
 
         /*
         ** Newer SCI1 games (like KQ5 CD and EcoQuest 1) use
         ** different semantics in kSetCursor(), like SCI1.1 games
         */
-        GF_SCI1_NEWSETCURSOR    = (1 << 6)
+        GF_SCI1_NEWSETCURSOR    = (1 << 7)
 };
 
 class SciEngine : public Engine {

engine/kernel.cpp

@@ -627 +627 @@
         switch (resmgr->_sciVersion) {
         case SCI_VERSION_0:
         case SCI_VERSION_01:
-                vocab_get_knames0(resmgr, names);
+                // HACK: The KQ1 demo requires the SCI1 vocabulary.
+                if (((SciEngine*)g_engine)->getFlags() & GF_SCI0_NEWVOCAB)
+                        vocab_get_knames1(resmgr, names);
+                else
+                        vocab_get_knames0(resmgr, names);
                 break;
         case SCI_VERSION_01_VGA:
         case SCI_VERSION_01_VGA_ODD: