Ticket #8780: hofIntroSjisFix.patch

screen.cpp

@@ -2769 +2769 @@
                 return _sjisOverlayPtrs[1];
         else if (page == 2 || page == 3)
                 return _sjisOverlayPtrs[2];
-        else
-                return 0;
+
+        if (_vm->gameFlags().gameID == GI_KYRA2) {
+                if (page == 12 || page == 13)
+                        return _sjisOverlayPtrs[3];
+        }
+        
+        return 0;
 }
 
 void Screen::clearOverlayPage(int page) {
@@ -2812 +2817 @@
         y <<= 1; y2 <<= 1;
         w <<= 1; h <<= 1;
 
-        dst += y2 * 640 + x2;
-        src += y * 640 + x;
+        if (w == 640 && h == 400) {
+                memcpy(dst, src, SCREEN_OVL_SJIS_SIZE);
+        } else {
+                dst += y2 * 640 + x2;
+                src += y * 640 + x;
 
-        while (h--) {
-                for (x = 0; x < w; ++x)
-                        memcpy(dst, src, w);
-                dst += 640;
-                src += 640;
+                while (h--) {
+                        for (x = 0; x < w; ++x)
+                                memcpy(dst, src, w);
+                        dst += 640;
+                        src += 640;
+                }
         }
 }
 
@@ -3086 +3095 @@
 
 } // End of namespace Kyra
 
+

screen.h

@@ -69 +69 @@
                 SCREEN_PAGE_SIZE = 320 * 200 + 1024,
                 SCREEN_OVL_SJIS_SIZE = 640 * 400,
                 SCREEN_PAGE_NUM = 16,
-                SCREEN_OVLS_NUM = 3
+                SCREEN_OVLS_NUM = 4
         };
 
         enum CopyRegionFlags {
@@ -327 +327 @@
 
 #endif
 
+

sequences_v2.cpp

@@ -1550 +1550 @@
 void KyraEngine_v2::seq_processText() {
         Screen::FontId curFont = _screen->setFont(Screen::FID_GOLDFONT_FNT);
         int curPage = _screen->setCurPage(2);
-        char outputStr[60];
+        char outputStr[70];
 
         for (int i = 0; i < 10; i++) {
                 if (_activeText[i].startTime + _activeText[i].duration > _system->getMillis() && _activeText[i].duration != -1) {