aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-11-09 19:22:29 +0100
committerStrangerke2012-11-09 19:23:39 +0100
commit0b72c77d28c4b294b95370ac0ba2c508181bec26 (patch)
treeed55a97f6968846232205caa087ef7245a2822f7
parentf642165f0a9037a23e1e2f8e2c80fbfa1c8a549e (diff)
downloadscummvm-rg350-0b72c77d28c4b294b95370ac0ba2c508181bec26.tar.gz
scummvm-rg350-0b72c77d28c4b294b95370ac0ba2c508181bec26.tar.bz2
scummvm-rg350-0b72c77d28c4b294b95370ac0ba2c508181bec26.zip
HOPKINS: Fix first displayed screen in full linux version
-rw-r--r--engines/hopkins/globals.cpp2
-rw-r--r--engines/hopkins/globals.h2
-rw-r--r--engines/hopkins/hopkins.cpp10
3 files changed, 10 insertions, 4 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 8e9d1bccba..e0bd0a4a3c 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -152,7 +152,7 @@ Globals::Globals() {
PLANX = PLANY = 0;
PLANI = 0;
PERSO = 0;
- PASSWORD = 0;
+ PASSWORD = false;
ECRAN = 0;
NOSPRECRAN = 0;
OLD_ECRAN = 0;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 607330ece3..95f8bdf641 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -396,7 +396,7 @@ public:
int SORTIE;
int PLANX, PLANY;
int PLANI;
- int PASSWORD;
+ bool PASSWORD; // CHECKME: Useless variable?
int NOSPRECRAN;
int ECRAN;
int OLD_ECRAN;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 456dee0639..a66012ae9f 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -118,7 +118,10 @@ Common::Error HopkinsEngine::run() {
_graphicsManager.Cls_Video();
_graphicsManager.DD_Unlock();
- _graphicsManager.LOAD_IMAGE("LINUX");
+ if (getIsDemo())
+ _graphicsManager.LOAD_IMAGE("LINUX");
+ else
+ _graphicsManager.LOAD_IMAGE("H2");
_graphicsManager.FADE_INW();
if (getIsDemo())
@@ -153,7 +156,10 @@ Common::Error HopkinsEngine::run() {
_globals.PLANX = _globals.PLANY = 0;
memset(_globals.SAUVEGARDE, 0, 2000);
_globals.SORTIE = 0;
- _globals.PASSWORD = 1;
+ if (getIsDemo())
+ _globals.PASSWORD = true;
+ else
+ _globals.PASSWORD = false;
LABEL_12:
if (_globals.SORTIE == 300)