From b0ce324685882c5e302958f64ad15dc04c0b9eae Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 28 Nov 2012 21:15:07 +1100
Subject: HOPKINS: Bugfix for ending delay after Bernie is killed

---
 engines/hopkins/globals.cpp | 2 --
 engines/hopkins/globals.h   | 2 --
 engines/hopkins/hopkins.cpp | 7 +++----
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 882d869d33..02f70f1bc3 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -126,8 +126,6 @@ Globals::Globals() {
 	VOICEVOL = 6;
 	XSETMODE = 0;
 	XZOOM = 0;
-	lItCounter = 0;
-	lOldItCounter = 0;
 	g_old_anim = 0;
 	g_old_sens = 0;
 	g_old_sens2 = 0;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 7d01d9fa45..abde148e20 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -372,8 +372,6 @@ public:
 	bool MUSICOFF;
 	bool VOICEOFF;
 	bool CENSURE;
-	int lItCounter;
-	int lOldItCounter;
 	int g_old_anim;
 	int g_old_sens, g_old_sens2;
 	int last_sens;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index ddb7e3ad95..dc65de0aa0 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -1475,8 +1475,6 @@ void HopkinsEngine::INIT_SYSTEM() {
 
 	_eventsManager.ofset_souris_x = 0;
 	_eventsManager.ofset_souris_y = 0;
-	_globals.lItCounter = 0;
-	_globals.lOldItCounter = 0;
 }
 
 void HopkinsEngine::INTRORUN() {
@@ -2071,11 +2069,12 @@ void HopkinsEngine::JOUE_FIN() {
 		_soundManager.DEL_SAMPLE(1);
 		_graphicsManager.LOAD_IMAGE("PLAN3");
 		_graphicsManager.FADE_INW();
-		_globals.lItCounter = 0;
+
+		_eventsManager.lItCounter = 0;
 		if (!_eventsManager.ESC_KEY) {
 			do
 				_eventsManager.CONTROLE_MES();
-			while (_globals.lItCounter < 2000 / _globals.vitesse && !_eventsManager.ESC_KEY);
+			while (_eventsManager.lItCounter < 2000 / _globals.vitesse && !_eventsManager.ESC_KEY);
 		}
 		_eventsManager.ESC_KEY = false;
 		_graphicsManager.FADE_OUTW();
-- 
cgit v1.2.3