From 4fed1f580eb3a02ffde3f3b8ee4f8167326a7782 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 29 Jan 2013 08:35:14 +0100
Subject: HOPKINS: More renaming in the Global class

---
 engines/hopkins/computer.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'engines/hopkins/computer.cpp')

diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index b4b89f7dac..38b464cf68 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -77,15 +77,15 @@ void ComputerManager::setTextMode() {
 	_vm->_graphicsManager.unlockScreen();
 
 	_vm->_graphicsManager._lineNbr = SCREEN_WIDTH;
-	_vm->_globals.police = _vm->_globals.freeMemory(_vm->_globals.police);
+	_vm->_globals._font = _vm->_globals.freeMemory(_vm->_globals._font);
 
 	Common::String filename = "STFONT.SPR";
 	Common::File f;
 	if (!f.exists(filename))
 		filename = "FONTE.SPR"; // Used by the BeOS and OS/2 versions as an alternative
-	_vm->_globals.police = _vm->_fileManager.loadFile(filename);
-	_vm->_globals.police_l = 8;
-	_vm->_globals.police_h = 8;
+	_vm->_globals._font = _vm->_fileManager.loadFile(filename);
+	_vm->_globals._fontFixedWidth = 8;
+	_vm->_globals._fontFixedHeight = 8;
 
 	_vm->_graphicsManager.loadImage("WINTEXT");
 	_vm->_graphicsManager.fadeInLong();
@@ -424,28 +424,28 @@ void ComputerManager::displayMessage(int xp, int yp, int textIdx) {
 		// BackSpace
 		if (curChar == 8 && textIndex > 0) {
 			_inputBuf[textIndex--] = 0;
-			x1 -= _vm->_globals.police_l;
-			x2 = x1 + 2 * _vm->_globals.police_l;
-			_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, 3 * _vm->_globals.police_l, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
+			x1 -= _vm->_globals._fontFixedWidth;
+			x2 = x1 + 2 * _vm->_globals._fontFixedWidth;
+			_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, 3 * _vm->_globals._fontFixedWidth, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
 			_vm->_graphicsManager.addVesaSegment(x1, yp, x2, yp + 12);
 			_vm->_fontManager.displayTextVesa(x1, yp, "_", 252);
 		}
 		if (mappedChar != '*') {
 			newChar = mappedChar;
-			_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, _vm->_globals.police_l, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
-			_vm->_graphicsManager.addVesaSegment(x1, yp, _vm->_globals.police_l + x1, yp + 12);
+			_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, _vm->_globals._fontFixedWidth, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
+			_vm->_graphicsManager.addVesaSegment(x1, yp, _vm->_globals._fontFixedWidth + x1, yp + 12);
 			_inputBuf[textIndex] = newChar;
 
 			charString = Common::String::format("%c_", newChar);
 			_vm->_fontManager.displayTextVesa(x1, yp, charString, 252);
 			++textIndex;
-			x1 += _vm->_globals.police_l;
+			x1 += _vm->_globals._fontFixedWidth;
 		}
 		_vm->_eventsManager.VBL();
 	} while (textIndex != textIdx && curChar != 13);
 
-	_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, _vm->_globals.police_l, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
-	_vm->_graphicsManager.addVesaSegment(x1, yp, _vm->_globals.police_l + x1, yp + 12);
+	_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, _vm->_globals._fontFixedWidth, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
+	_vm->_graphicsManager.addVesaSegment(x1, yp, _vm->_globals._fontFixedWidth + x1, yp + 12);
 
 	_vm->_eventsManager.VBL();
 	_inputBuf[textIndex] = 0;
@@ -470,11 +470,11 @@ void ComputerManager::outText2(const Common::String &msg) {
  * Restores the scene for the FBI headquarters room
  */
 void ComputerManager::restoreFBIRoom() {
-	_vm->_globals.freeMemory(_vm->_globals.police);
-	_vm->_globals.police = _vm->_fileManager.loadFile("FONTE3.SPR");
+	_vm->_globals.freeMemory(_vm->_globals._font);
+	_vm->_globals._font = _vm->_fileManager.loadFile("FONTE3.SPR");
 
-	_vm->_globals.police_l = 12;
-	_vm->_globals.police_h = 21;
+	_vm->_globals._fontFixedWidth = 12;
+	_vm->_globals._fontFixedHeight = 21;
 	_vm->_eventsManager._mouseFl = true;
 }
 
-- 
cgit v1.2.3