diff options
| author | Strangerke | 2012-11-08 08:29:26 +0100 |
|---|---|---|
| committer | Strangerke | 2012-11-08 08:29:26 +0100 |
| commit | c2a5b4b33962bb60954dba086ebafcc5464359a1 (patch) | |
| tree | c110d128b8ea6f9c0bd02090d17d9612e640ae40 | |
| parent | 96ca3ba91806929ca880cea25e535d70244f3f3e (diff) | |
| download | scummvm-rg350-c2a5b4b33962bb60954dba086ebafcc5464359a1.tar.gz scummvm-rg350-c2a5b4b33962bb60954dba086ebafcc5464359a1.tar.bz2 scummvm-rg350-c2a5b4b33962bb60954dba086ebafcc5464359a1.zip | |
HOPKINS: More full version initialization, change 2 variables to boolean
| -rw-r--r-- | engines/hopkins/globals.cpp | 11 | ||||
| -rw-r--r-- | engines/hopkins/globals.h | 4 | ||||
| -rw-r--r-- | engines/hopkins/graphics.cpp | 10 | ||||
| -rw-r--r-- | engines/hopkins/hopkins.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/script.cpp | 2 |
5 files changed, 21 insertions, 8 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index ee2ae86926..8e9d1bccba 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -116,8 +116,9 @@ Globals::Globals() { // Initialise fields FR = 0; SVGA = 2; - internet = 1; - PUBEXIT = 0; + internet = true; + + PUBEXIT = false; vitesse = 1; INSTALL_TYPE = 1; MUSICVOL = 6; @@ -298,6 +299,12 @@ void Globals::setConfig() { break; } + if (_vm->getIsDemo()) + internet = true; + else + internet = false; + // End of CHECKME + switch (FR) { case 0: FICH_ZONE = "ZONEAN.TXT"; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index 204c05e4ed..607330ece3 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -316,8 +316,8 @@ public: TriItem Tri[51]; int FR; int SVGA; - int internet; - int PUBEXIT; + bool internet; + bool PUBEXIT; bool XFULLSCREEN; int XSETMODE; int XZOOM; diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 72c01c2c37..3088953315 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -48,8 +48,14 @@ GraphicsManager::GraphicsManager() { PCX_L = PCX_H = 0; DOUBLE_ECRAN = false; OLD_SCROLL = 0; - MANU_SCROLL = 1; - SPEED_SCROLL = 16; + if (_vm->getIsDemo()) { + // CHECKME: Should be 0? + MANU_SCROLL = 1; + SPEED_SCROLL = 16; + } else { + MANU_SCROLL = 0; + SPEED_SCROLL = 32; + } nbrligne2 = 0; Agr_x = Agr_y = 0; Agr_Flag_x = Agr_Flag_y = 0; diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index ba3c1da752..ca3c683732 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -980,7 +980,7 @@ void HopkinsEngine::REST_SYSTEM() { } void HopkinsEngine::PUBQUIT() { - _globals.PUBEXIT = 1; + _globals.PUBEXIT = true; _graphicsManager.RESET_SEGMENT_VESA(); _globals.FORET = 0; _eventsManager.CASSE = false; diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index 57b691a129..a26ae0c7d3 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -722,7 +722,7 @@ LABEL_1141: if (!_vm->_globals.internet) { memcpy(_vm->_graphicsManager.OLD_PAL, _vm->_graphicsManager.Palette, 0x301u); v1 = _vm->_graphicsManager.OLD_PAL[769]; - _vm->_animationManager.PLAY_ANM2("plan.ANm", 50, 10, 800); + _vm->_animationManager.PLAY_ANM2("PLAN.ANM", 50, 10, 800); } _vm->_globals.NBBLOC = 0; } |