From 72f7421b6d156b9c0e43aff116f5471aca322296 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 19 Feb 2013 07:54:57 +0100
Subject: HOPKINS: Remove a couple of useless variables and associated dead
 code

---
 engines/hopkins/font.cpp    | 8 --------
 engines/hopkins/globals.cpp | 2 --
 engines/hopkins/globals.h   | 1 -
 engines/hopkins/hopkins.cpp | 1 -
 engines/hopkins/lines.h     | 5 ++---
 5 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'engines/hopkins')

diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 86a4352d04..ee1634a86f 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -327,14 +327,6 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
 				_text[idx]._pos.x = i;
 				textPosX = _vm->_eventsManager._startPos.x + i;
 			} else {
-				if (_vm->_globals.nbrligne == (SCREEN_WIDTH - 1)) {
-					while (_vm->_globals._boxWidth + textPosX > 638 && textPosX > -2)
-						textPosX -= 2;
-				}
-				if (_vm->_globals.nbrligne == (SCREEN_WIDTH * 2)) {
-					while (_vm->_globals._boxWidth + textPosX > 1278 && textPosX > -2)
-						textPosX -= 2;
-				}
 				_text[idx]._pos.x = textPosX;
 			}
 		}
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 633f222092..f08dd59db6 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -107,7 +107,6 @@ Globals::Globals() {
 	_oldDirectionSpriteIdx = 59;
 	_lastDirection = DIR_NONE;
 	NUM_FICHIER_OBJ = 0;
-	nbrligne = 0;
 	_boxWidth = 0;
 	_objectWidth = _objectHeight = 0;
 	_catalogPos = 0;
@@ -238,7 +237,6 @@ void Globals::clearAll() {
 	for (int idx = 0; idx < 6; ++idx)
 		CACHE_BANQUE[idx] = g_PTRNUL;
 
-	nbrligne = 80;
 	INIT_ANIM();
 
 	_boxWidth = 0;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index bfd5d01307..7e063bf38c 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -307,7 +307,6 @@ public:
 	bool NOMARCHE;
 	int iRegul;
 	byte *BUF_ZONE;
-	int nbrligne; // Useless variable?
 	BqeAnimItem Bqe_Anim[35];
 	byte *SPRITE_ECRAN;
 	byte *PERSO;
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 3a32c2c079..de89ab52f8 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -2196,7 +2196,6 @@ void HopkinsEngine::playEnding() {
 void HopkinsEngine::displayPlane() {
 	_soundManager.WSOUND(28);
 	_globals.iRegul = 1;
-	_globals.nbrligne = SCREEN_WIDTH;
 	_graphicsManager.lockScreen();
 	_graphicsManager.clearScreen();
 	_graphicsManager.unlockScreen();
diff --git a/engines/hopkins/lines.h b/engines/hopkins/lines.h
index 5df9a59daf..70fd5086bc 100644
--- a/engines/hopkins/lines.h
+++ b/engines/hopkins/lines.h
@@ -94,10 +94,9 @@ struct RouteItem {
 	int16 _X;
 	int16 _Y;
 	Directions _dir;
-	int16 _unk;
 	bool isValid() const { return _X != -1 || _Y != -1; }
-	void invalidate() { _X = _Y = _unk = -1; _dir = DIR_NONE; }
-	void set(int16 X, int16 Y, Directions dir) { _X = X; _Y = Y; _dir = dir; _unk = 0; }
+	void invalidate() { _X = _Y = -1; _dir = DIR_NONE; }
+	void set(int16 X, int16 Y, Directions dir) { _X = X; _Y = Y; _dir = dir; }
 };
 
 
-- 
cgit v1.2.3