HOPKINS: Improve private/public scope in Globals. Remove some useless variables, move some variables to FontManager

1 files changed, 90 insertions, 91 deletions

diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 033d40f935..c2b9ec6e69 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -270,129 +270,128 @@ class HopkinsEngine;
 class Globals {
 private:
 	HopkinsEngine *_vm;
+
+	byte *_inventoryObject;
+
+	void INIT_ANIM();
+	void INIT_VBOB();
+	void B_CACHE_OFF(int idx);
+
 public:
-	byte *CACHE_BANQUE[6];
-	ZonePItem ZONEP[106];
-	BqeAnimItem Bqe_Anim[35];
-	BankItem Bank[8];
-	BobItem _bob[36];
-	ListeItem Liste[6];
-	ListeItem Liste2[35];
-	LockAnimItem _lockedAnims[30];
-	VBobItem VBob[30];
-	ObjetWItem ObjetW[300];
-	CacheItem Cache[25];
-	int BOBZONE[105];
-	bool BOBZONE_FLAG[105];
-	int _spriteSize[500];
-	HopkinsItem Hopkins[70];
-	int _inventory[36];
-	SortItem _sortedDisplay[51];
-	Language _language;
+	bool _disableInventFl;
+	bool _cityMapEnabledFl;
 	bool _linuxEndDemoFl;
-	int PERSO_TYPE;
-	uint _speed;
-	Common::String FICH_ZONE;
-	Common::String FICH_TEXTE;
 	bool _censorshipFl;
-	int _oldFrameIndex;
+	bool _helicopterFl;
+	bool _forestFl;
+	bool _introSpeechOffFl;
+	bool _cacheFl;
+	bool _forceHideText;
+	int _exitId;
+	int _oceanDirection;
 	int _oldDirection, _oldDirectionSpriteIdx;
+	int _actionDirection;
 	int _lastDirection;
-	byte *_font;
-	int _fontFixedWidth;
-	int _fontFixedHeight;
-	byte *TETE;
-	byte *ICONE;
-	byte *BUF_ZONE;
-	byte *SPRITE_ECRAN;
-	Sauvegarde *_saveData;
-	byte *GESTE;
-	int NUM_FICHIER_OBJ;
-	int nbrligne; // Useless variable?
-	int _boxWidth;
-	byte *_inventoryObject;
-	int GESTE_FLAG;
-	byte *_forestSprite;
-	bool _forestFl;
-	byte *_answerBuffer;
-	byte *ADR_FICHIER_OBJ;
-	byte *PERSO;
+	int _oldFrameIndex;
+	int _hotspotTextColor;
+	int _inventory[36];
 	int _objectWidth, _objectHeight;
-	bool _helicopterFl;
-	uint32 _catalogPos;
-	uint32 _catalogSize;
-	int iRegul;
-	int _exitId;
-	int _mapCarPosX, _mapCarPosY;
 	int _screenId;
 	int _prevScreenId;
+	int _boxWidth;
+	int _mapCarPosX, _mapCarPosY;
 	int _characterMaxPosY;
-	bool _disableInventFl;
-	bool NOMARCHE;
-	byte *_optionDialogSpr;
-	bool _optionDialogFl;
-	int _menuDisplayType;
+	int _baseMapColor;
+	int _spriteSize[500];
+	int _sortedDisplayCount;
+	int _oldMouseZoneId;
+	int _oldMouseX, _oldMouseY;
+	uint _speed;
+	byte *_forestSprite;
+	byte *_answerBuffer;
+	Sauvegarde *_saveData;
+	Language _language;
+	HopkinsItem Hopkins[70];
+	BobItem _bob[36];
+	SortItem _sortedDisplay[51];
+
+	CreditItem _creditsItem[200];
+	int _creditsLineNumb;
+	int _creditsStep;
+	int _creditsPosY;
+	int Credit_bx;
+	int Credit_bx1;
+	int Credit_by;
+	int Credit_by1;
+
 	int _menuSpeed;
-	int _menuScrollType;
-	int _menuScrollSpeed;
 	int _menuSoundOff;
+	int _menuTextOff;
 	int _menuVoiceOff;
 	int _menuMusicOff;
-	int _menuTextOff;
-	int _sortedDisplayCount;
-	bool NOT_VERIF;
-	bool _cacheFl;
-	bool _introSpeechOffFl;
-	bool _cityMapEnabledFl;
-	bool GOACTION;
-	int Compteur;
-	int _actionDirection;
-	int _baseMapColor;
+	int _menuDisplayType;
+	int _menuScrollSpeed;
 
-	int _hotspotTextColor;
+	byte *_optionDialogSpr;
+	bool _optionDialogFl;
+	uint32 _catalogPos;
+	uint32 _catalogSize;
+	LockAnimItem _lockedAnims[30];
 	int _oldRouteFromX;
 	int _oldRouteFromY;
 	int _oldRouteDestX;
-	int _oldMouseZoneId;
-	int _oldMouseX, _oldMouseY;
-	int compteur_71;
-	bool _forceHideText;
 	int _oldRouteDestY;
 	int _oldZoneNum;
-	int j_104;
-
-	int Credit_bx;
-	int Credit_bx1;
-	int Credit_by;
-	int Credit_by1;
-	int _creditsPosY;
-	int _creditsLineNumb;
-	CreditItem _creditsItem[200];
-	int _creditsStep;
 
-	int _oceanDirection;
+	byte *TETE;
+	byte *ICONE;
+	bool NOMARCHE;
+	int iRegul;
+	byte *BUF_ZONE;
+	int nbrligne; // Useless variable?
+	BqeAnimItem Bqe_Anim[35];
+	byte *SPRITE_ECRAN;
+	byte *PERSO;
+	int PERSO_TYPE;
+	int BOBZONE[105];
+	bool BOBZONE_FLAG[105];
+	bool NOT_VERIF;
+	ZonePItem ZONEP[106];
+	ObjetWItem ObjetW[300];
+	int NUM_FICHIER_OBJ;
+	byte *ADR_FICHIER_OBJ;
+	ListeItem Liste[6];
+	ListeItem Liste2[35];
+	BankItem Bank[8];
+	byte *CACHE_BANQUE[6];
+	CacheItem Cache[25];
+	VBobItem VBob[30];
+	int Compteur;
+	int compteur_71;
+	Common::String FICH_ZONE;
+	bool GOACTION;
+	int j_104;
+	int GESTE_FLAG;
+	byte *GESTE;
+	Common::String FICH_TEXTE;
 
 	Globals();
 	~Globals();
 	void setParent(HopkinsEngine *vm);
-
+	byte *allocMemory(int count);
+	byte *freeMemory(byte *p);
 	void setConfig();
+	void loadObjects();
 	void clearAll();
 	void loadCharacterData();
-	void INIT_ANIM();
-	void INIT_VBOB();
-	void CLEAR_VBOB();
-	void loadObjects();
-	byte *allocMemory(int count);
-	byte *freeMemory(byte *p);
-
 	void resetCache();
+	void loadCache(const Common::String &file);
+
+	void CLEAR_VBOB();
 	void CACHE_ON();
 	void CACHE_OFF(int v1 = 0);
 	void CACHE_SUB(int idx);
 	void CACHE_ADD(int idx);
-	void loadCache(const Common::String &file);
-	void B_CACHE_OFF(int idx);
 };
 
 // Global null pointer