HOPKINS: Add code specific to full linux version in PARLER_PERSO

Also change another variable type
scummvm · Oct 31, 2012 · bf3f30b · bf3f30b
1 parent 798ddfa
commit bf3f30b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -428,8 +428,8 @@ class Globals {
 	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
@@ -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
@@ -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();