diff options
author | Paul Gilbert | 2012-11-09 22:12:48 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-11-09 22:12:48 +1100 |
commit | f642165f0a9037a23e1e2f8e2c80fbfa1c8a549e (patch) | |
tree | d3e1a9e577b78086b695aa181378d54ef42913cb /engines | |
parent | 0942e16f65a069110115f3fddc4b1c1997b6c74e (diff) | |
parent | 704fea1bcf0c4d7595a076802a654caa9c1f9f0b (diff) | |
download | scummvm-rg350-f642165f0a9037a23e1e2f8e2c80fbfa1c8a549e.tar.gz scummvm-rg350-f642165f0a9037a23e1e2f8e2c80fbfa1c8a549e.tar.bz2 scummvm-rg350-f642165f0a9037a23e1e2f8e2c80fbfa1c8a549e.zip |
Merge branch 'hopkins' of github.com:dreammaster/scummvm into hopkins
Diffstat (limited to 'engines')
-rw-r--r-- | engines/hopkins/hopkins.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index ca3c683732..456dee0639 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -104,6 +104,9 @@ Common::Error HopkinsEngine::run() { _soundManager.WSOUND_INIT(); + if (!getIsDemo()) + _soundManager.WSOUND(16); + _globals.CHARGE_OBJET(); _objectsManager.CHANGE_OBJET(14); _objectsManager.AJOUTE_OBJET(14); @@ -118,19 +121,28 @@ Common::Error HopkinsEngine::run() { _graphicsManager.LOAD_IMAGE("LINUX"); _graphicsManager.FADE_INW(); - _eventsManager.delay(1500); - _graphicsManager.FADE_OUTW(); - - if (!_globals.internet) { + if (getIsDemo()) + _eventsManager.delay(1500); + else { + _eventsManager.delay(500); + _globals.vitesse = 2; + _globals.iRegul = 1; _graphicsManager.FADE_LINUX = 2; - _animationManager.PLAY_ANM("MP.ANM", 10, 16, 200); } - - _graphicsManager.LOAD_IMAGE("H2"); - _graphicsManager.FADE_INW(); - _eventsManager.delay(500); _graphicsManager.FADE_OUTW(); + if (getIsDemo()) { + if (!_globals.internet) { + _graphicsManager.FADE_LINUX = 2; + _animationManager.PLAY_ANM("MP.ANM", 10, 16, 200); + } + + _graphicsManager.LOAD_IMAGE("H2"); + _graphicsManager.FADE_INW(); + _eventsManager.delay(500); + _graphicsManager.FADE_OUTW(); + } + if (!_eventsManager.ESC_KEY) INTRORUN(); |