From 17da9c0694aaa4a4514c84c624adb67e25b24c5f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 9 Dec 2012 10:00:13 +0100
Subject: HOPKINS: Fix crash in Win95 EN Demo, enable intro in Win95 PL demo

---
 engines/hopkins/hopkins.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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];
 
-- 
cgit v1.2.3