aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2012-12-09 10:00:13 +0100
committerStrangerke2012-12-09 10:00:13 +0100
commit17da9c0694aaa4a4514c84c624adb67e25b24c5f (patch)
treee1480c423d49d07e6b1fa98f2165d87c4be4cd19 /engines
parent88c223824ed586c10d9f90f3b08c0fe1b5d5e7bc (diff)
downloadscummvm-rg350-17da9c0694aaa4a4514c84c624adb67e25b24c5f.tar.gz
scummvm-rg350-17da9c0694aaa4a4514c84c624adb67e25b24c5f.tar.bz2
scummvm-rg350-17da9c0694aaa4a4514c84c624adb67e25b24c5f.zip
HOPKINS: Fix crash in Win95 EN Demo, enable intro in Win95 PL demo
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/hopkins.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index df18dc12e2..edcfb5afb5 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -142,7 +142,10 @@ bool HopkinsEngine::runWin95Demo() {
_graphicsManager.LOAD_IMAGE("H2");
_graphicsManager.FADE_INW();
-
+
+ if (!_eventsManager.ESC_KEY)
+ INTRORUN();
+
warning("TODO Fin_Interrupt()");
warning("TODO TEST = 1;");
warning("TODO no_vsync = 1;");
@@ -2688,6 +2691,10 @@ void HopkinsEngine::INIT_SYSTEM() {
}
void HopkinsEngine::INTRORUN() {
+ // Win95 EN demo doesn't include the intro
+ if ((getLanguage() == Common::EN_ANY) && (getPlatform() == Common::kPlatformWindows) && (getIsDemo()))
+ return;
+
byte paletteData[PALETTE_EXT_BLOCK_SIZE];
byte paletteData2[PALETTE_EXT_BLOCK_SIZE];