diff options
| author | Strangerke | 2012-10-31 22:15:09 +0100 |
|---|---|---|
| committer | Strangerke | 2012-10-31 22:15:09 +0100 |
| commit | bf3f30bc140e87a933f929986f4ec500a8b7abf4 (patch) | |
| tree | ae4eeca8c44727128191f558800c5cc9d798522e /engines/hopkins | |
| parent | 798ddfaab500bb212f620cf095328eee5eb140a4 (diff) | |
| download | scummvm-rg350-bf3f30bc140e87a933f929986f4ec500a8b7abf4.tar.gz scummvm-rg350-bf3f30bc140e87a933f929986f4ec500a8b7abf4.tar.bz2 scummvm-rg350-bf3f30bc140e87a933f929986f4ec500a8b7abf4.zip | |
HOPKINS: Add code specific to full linux version in PARLER_PERSO
Also change another variable type
Diffstat (limited to 'engines/hopkins')
| -rw-r--r-- | engines/hopkins/globals.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/globals.h | 2 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 4 | ||||
| -rw-r--r-- | engines/hopkins/talk.cpp | 12 |
4 files changed, 12 insertions, 8 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index 0dd8caec9f..1ed40701e1 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -174,7 +174,7 @@ Globals::Globals() { NOT_VERIF = 0; PERSO_TYPE = 0; GOACTION = 0; - NECESSAIRE = 0; + NECESSAIRE = false; Compteur = 0; ACTION_SENS = 0; ACTION_SENS = 0; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index 26d219a816..0110e674e8 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -428,8 +428,8 @@ public: bool CACHEFLAG; bool NOPARLE; bool PLAN_FLAG; + bool NECESSAIRE; int GOACTION; - int NECESSAIRE; int Compteur; int ACTION_SENS; int SegmentEnCours; diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index bc592b34ce..60e64c2b23 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -4280,9 +4280,9 @@ void ObjectsManager::SPECIAL_JEU() { _vm->_animationManager.PLAY_ANM("otage.ANM", 1, 24, 500); _vm->_animationManager.NO_SEQ = false; _vm->_soundManager.SPECIAL_SOUND = 0; - _vm->_globals.NECESSAIRE = 1; + _vm->_globals.NECESSAIRE = true; _vm->_graphicsManager.NB_SCREEN(); - _vm->_globals.NECESSAIRE = 0; + _vm->_globals.NECESSAIRE = false; _vm->_saveLoadManager.bload("TEMP1.SCR", _vm->_graphicsManager.VESA_SCREEN); g_system->getSavefileManager()->removeSavefile("TEMP1.SCR"); diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 3dc883c871..44f7e704f5 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -142,11 +142,11 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { } CLEAR_ANIM_PERSO(); _vm->_globals.NOPARLE = false; - _vm->_globals.NECESSAIRE = 1; + _vm->_globals.NECESSAIRE = true; BUFFERPERSO = _vm->_globals.LIBERE_FICHIER(BUFFERPERSO); PERSOSPR = _vm->_globals.LIBERE_FICHIER(PERSOSPR); _vm->_graphicsManager.NB_SCREEN(); - _vm->_globals.NECESSAIRE = 0; + _vm->_globals.NECESSAIRE = false; _vm->_saveLoadManager.bload("TEMP.SCR", _vm->_graphicsManager.VESA_SCREEN); g_system->getSavefileManager()->removeSavefile("TEMP.SCR"); @@ -156,6 +156,10 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) { _vm->_eventsManager.CHANGE_MOUSE(v14); _vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100); + + if (_vm->getIsDemo() == false) + _vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0); + _vm->_graphicsManager.INIT_TABLE(145, 150, _vm->_graphicsManager.Palette); _vm->_graphicsManager.setpal_vga256(_vm->_graphicsManager.Palette); _vm->_graphicsManager.DD_LOCK(); @@ -1281,11 +1285,11 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) { CLEAR_ANIM_PERSO(); CLEAR_ANIM_PERSO(); _vm->_globals.NOPARLE = false; - _vm->_globals.NECESSAIRE = 1; + _vm->_globals.NECESSAIRE = true; BUFFERPERSO = _vm->_globals.LIBERE_FICHIER(BUFFERPERSO); PERSOSPR = _vm->_globals.LIBERE_FICHIER(PERSOSPR); _vm->_graphicsManager.NB_SCREEN(); - _vm->_globals.NECESSAIRE = 0; + _vm->_globals.NECESSAIRE = false; _vm->_linesManager.CLEAR_ZONE(); _vm->_linesManager.RESET_OBSTACLE(); _vm->_globals.RESET_CACHE(); |