HOPKINS: Remove useless globals and rename some variables

scummvm · Jan 7, 2013 · 5f171c5 · 5f171c5
1 parent 55337fa
commit 5f171c5
Show file tree

Hide file tree

Showing 5 changed files with 237 additions and 244 deletions.
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
@@ -134,7 +134,6 @@ Globals::Globals() {
 	_helicopterFl = false;
 	_catalogPos = 0;
 	_catalogSize = 0;
-	_newObjectFl = false;
 	iRegul = 0;
 	_exitId = 0;
 	PLANX = PLANY = 0;
@@ -143,10 +142,9 @@ Globals::Globals() {
 	_screenId = 0;
 	NOSPRECRAN = false;
 	_prevScreenId = 0;
-	Max_Ligne_Long = 0;
+	_maxLineLength = 0;
 	Max_Perso_Y = 0;
 	Max_Propre = 0;
-	fmusic = 0;
 	NBBLOC = 0;
 	_menuScrollType = 0;
 	_menuScrollSpeed = 0;

diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
@@ -370,7 +370,6 @@ class Globals {
 	byte *ADR_FICHIER_OBJ;
 	byte *PERSO;
 	int _objectWidth, _objectHeight;
-	bool _newObjectFl;
 	bool _helicopterFl;
 	uint32 _catalogPos;
 	uint32 _catalogSize;
@@ -381,9 +380,8 @@ class Globals {
 	bool NOSPRECRAN;
 	int _screenId;
 	int _prevScreenId;
-	int fmusic;
 	int Max_Propre;
-	int Max_Ligne_Long;
+	int _maxLineLength;
 	int Max_Perso_Y;
 	bool _disableInventFl;
 	bool NOMARCHE;