HOPKINS: More renaming in Globals and ObjectsManager

engines/hopkins/dialogs.cpp

@@ -373,7 +373,7 @@ void DialogsManager::showInventory() {
 				int inventIdx = _vm->_globals._inventory[inventCount];
 				// The last two zones are not reserved for the inventory: Options and Save/Load
 				if (inventIdx && inventCount <= 29) {
-					byte *obj = _vm->_objectsManager.CAPTURE_OBJET(inventIdx, false);
+					byte *obj = _vm->_objectsManager.loadObjectFromFile(inventIdx, false);
 					_vm->_graphicsManager.restoreSurfaceRect(_vm->_graphicsManager._vesaBuffer, obj, _inventX + curPosX + 6,
 						curPosY + 120, _vm->_globals._objectWidth, _vm->_globals._objectHeight);
 					_vm->_globals.freeMemory(obj);

engines/hopkins/globals.cpp

@@ -81,7 +81,7 @@ Globals::Globals() {
 		Common::fill((byte *)&VBob[i], (byte *)&VBob[i] + sizeof(VBobItem), 0);
 	}
 	for (int i = 0; i < 300; ++i)
-		Common::fill((byte *)&ObjetW[i], (byte *)&ObjetW[i] + sizeof(ObjetWItem), 0);
+		Common::fill((byte *)&_objectAuthIcons[i], (byte *)&_objectAuthIcons[i] + sizeof(ObjectAuthIcon), 0);
 	for (int i = 0; i < 25; ++i)
 		Common::fill((byte *)&_hidingItem[i], (byte *)&_hidingItem[i] + sizeof(HidingItem), 0);
 
@@ -104,7 +104,7 @@ Globals::Globals() {
 	_oldDirection = DIR_NONE;
 	_oldDirectionSpriteIdx = 59;
 	_lastDirection = DIR_NONE;
-	NUM_FICHIER_OBJ = 0;
+	_curObjectFileNum = 0;
 	_boxWidth = 0;
 	_objectWidth = _objectHeight = 0;
 	_catalogPos = 0;
@@ -148,7 +148,7 @@ Globals::Globals() {
 	_saveData = NULL;
 	_inventoryObject = NULL;
 	_answerBuffer = g_PTRNUL;
-	ADR_FICHIER_OBJ = NULL;
+	_objectDataBuf = NULL;
 	PERSO = NULL;
 	_optionDialogSpr = NULL;
 
@@ -183,7 +183,7 @@ Globals::~Globals() {
 	freeMemory((byte *)_saveData);
 	freeMemory(_inventoryObject);
 	freeMemory(_answerBuffer);
-	freeMemory(ADR_FICHIER_OBJ);
+	freeMemory(_objectDataBuf);
 	freeMemory(PERSO);
 
 	clearVBob();
@@ -217,16 +217,16 @@ void Globals::setConfig() {
 
 	switch (_language) {
 	case LANG_EN:
-		FICH_ZONE = "ZONEAN.TXT";
-		FICH_TEXTE = "TEXTEAN.TXT";
+		_zoneFilename = "ZONEAN.TXT";
+		_textFilename = "TEXTEAN.TXT";
 		break;
 	case LANG_FR:
-		FICH_ZONE = "ZONE01.TXT";
-		FICH_TEXTE = "TEXTE01.TXT";
+		_zoneFilename = "ZONE01.TXT";
+		_textFilename = "TEXTE01.TXT";
 		break;
 	case LANG_SP:
-		FICH_ZONE = "ZONEES.TXT";
-		FICH_TEXTE = "TEXTEES.TXT";
+		_zoneFilename = "ZONEES.TXT";
+		_textFilename = "TEXTEES.TXT";
 		break;
 	}
 }
@@ -242,8 +242,8 @@ void Globals::clearAll() {
 	_vm->_fontManager.clearAll();
 
 	initVBob();
-	ADR_FICHIER_OBJ = g_PTRNUL;
-	NUM_FICHIER_OBJ = 0;
+	_objectDataBuf = g_PTRNUL;
+	_curObjectFileNum = 0;
 	_vm->_eventsManager._objectBuf = g_PTRNUL;
 	_vm->_dialogsManager._inventWin1 = g_PTRNUL;
 	_vm->_dialogsManager._inventBuf2 = g_PTRNUL;
@@ -263,7 +263,7 @@ void Globals::clearAll() {
 	_vm->_eventsManager._objectBuf = allocMemory(2500);
 	_inventoryObject = allocMemory(2500);
 
-	ADR_FICHIER_OBJ = g_PTRNUL;
+	_objectDataBuf = g_PTRNUL;
 }
 
 void Globals::loadCharacterData() {
@@ -325,14 +325,14 @@ void Globals::loadObjects() {
 	byte *srcP = data;
 
 	for (int idx = 0; idx < 300; ++idx) {
-		ObjetW[idx].field0 = *srcP++;
-		ObjetW[idx]._idx = *srcP++;
-		ObjetW[idx].field2 = *srcP++;
-		ObjetW[idx].field3 = *srcP++;
-		ObjetW[idx].field4 = *srcP++;
-		ObjetW[idx].field5 = *srcP++;
-		ObjetW[idx].field6 = *srcP++;
-		ObjetW[idx].field7 = *srcP++;
+		_objectAuthIcons[idx]._objectFileNum = *srcP++;
+		_objectAuthIcons[idx]._idx = *srcP++;
+		_objectAuthIcons[idx]._flag1 = *srcP++;
+		_objectAuthIcons[idx]._flag2 = *srcP++;
+		_objectAuthIcons[idx]._flag3 = *srcP++;
+		_objectAuthIcons[idx]._flag4 = *srcP++;
+		_objectAuthIcons[idx]._flag5 = *srcP++;
+		_objectAuthIcons[idx]._flag6 = *srcP++;
 	}
 
 	freeMemory(data);

engines/hopkins/globals.h

@@ -29,7 +29,6 @@
 
 namespace Hopkins {
 
-
 struct BqeAnimItem {
 	byte *_data;
 	bool _enabledFl;
@@ -69,21 +68,21 @@ struct VBobItem {
 	byte *_oldSpriteData;
 };
 
-struct ObjetWItem {
-	byte field0;
+struct ObjectAuthIcon {
+	byte _objectFileNum;
 	byte _idx;
-	byte field2;
-	byte field3;
-	byte field4;
-	byte field5;
-	byte field6;
-	byte field7;
+	byte _flag1;
+	byte _flag2;
+	byte _flag3;
+	byte _flag4;
+	byte _flag5;
+	byte _flag6;
 };
 
 /**
  * Mode for SortItem records
  */
-enum SortMode { SORT_NONE = 0, SORT_BOB = 1, SORT_SPRITE = 2, SORT_CACHE = 3 };
+enum SortMode { SORT_NONE = 0, SORT_BOB = 1, SORT_SPRITE = 2, SORT_HIDING = 3 };
 
 /**
  * Structure to represent a pending display of either a Bob, Sprite, or Cache Item.
@@ -96,8 +95,8 @@ struct SortItem {
 
 struct HidingItem {
 	int _x;
-	int _spriteIndex;
 	int _y;
+	int _spriteIndex;
 	int _width;
 	int _height;
 	int _useCount;
@@ -311,22 +310,22 @@ class Globals {
 	byte *_hidingItemData[6];
 	HidingItem _hidingItem[25];
 	BqeAnimItem _animBqe[35];
+	ObjectAuthIcon _objectAuthIcons[300];
+	int _curObjectFileNum;
+	byte *_objectDataBuf;
+	Common::String _zoneFilename;
+	Common::String _textFilename;
 
 	int iRegul;
 	byte *BUF_ZONE;
 	byte *SPRITE_ECRAN;
 	byte *PERSO;
-	ObjetWItem ObjetW[300];
-	int NUM_FICHIER_OBJ;
-	byte *ADR_FICHIER_OBJ;
 	ListeItem Liste[6];
 	ListeItem Liste2[35];
 	BankItem Bank[8];
 	VBobItem VBob[30];
 	int Compteur;
 	int compteur_71;
-	Common::String FICH_ZONE;
-	Common::String FICH_TEXTE;
 
 	Globals();
 	~Globals();
@@ -343,8 +342,8 @@ class Globals {
 	void disableHiding();
 	void resetHidingUseCount(int idx);
 	void setHidingUseCount(int idx);
-
 	void clearVBob();
+
 	void B_CACHE_OFF(int idx);
 };
 

engines/hopkins/lines.cpp

@@ -2924,7 +2924,7 @@ void LinesManager::checkZone() {
 				ZONEP[zoneId]._verbFl7 || ZONEP[zoneId]._verbFl8 ||
 				ZONEP[zoneId]._verbFl9 || ZONEP[zoneId]._verbFl10) {
 					if (_vm->_globals._oldMouseZoneId != zoneId) {
-						_vm->_fontManager.initTextBuffers(5, ZONEP[zoneId]._messageId, _vm->_globals.FICH_ZONE, 0, 430, 0, 0, 252);
+						_vm->_fontManager.initTextBuffers(5, ZONEP[zoneId]._messageId, _vm->_globals._zoneFilename, 0, 430, 0, 0, 252);
 						_vm->_fontManager.showText(5);
 						_vm->_globals._forceHideText = true;
 					}