HOPKINS: Get rid of the NOSPRECRAN global variable

scummvm · Jan 7, 2013 · e57c82f · e57c82f
1 parent 60e1193
commit e57c82f
Show file tree

Hide file tree

Showing 9 changed files with 367 additions and 618 deletions.
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
@@ -140,7 +140,6 @@ Globals::Globals() {
 	PLANI = 0;
 	PERSO = 0;
 	_screenId = 0;
-	NOSPRECRAN = false;
 	_prevScreenId = 0;
 	_maxLineLength = 0;
 	Max_Perso_Y = 0;

diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
@@ -377,7 +377,6 @@ class Globals {
 	int _exitId;
 	int PLANX, PLANY;
 	int PLANI;
-	bool NOSPRECRAN;
 	int _screenId;
 	int _prevScreenId;
 	int Max_Propre;

diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
@@ -1753,16 +1753,16 @@ void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp,
 }
 
 // Init Screen
-void GraphicsManager::INI_ECRAN(const Common::String &file) {
-	OPTI_INI(file, 0);
+void GraphicsManager::INI_ECRAN(const Common::String &file, bool initializeScreen) {
+	OPTI_INI(file, 0, initializeScreen);
 }
 
 // Init Screen 2
-void GraphicsManager::INI_ECRAN2(const Common::String &file) {
-	OPTI_INI(file, 2);
+void GraphicsManager::INI_ECRAN2(const Common::String &file, bool initializeScreen) {
+	OPTI_INI(file, 2, initializeScreen);
 }
 
-void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
+void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initializeScreen) {
 	Common::String filename = file + ".ini";
 	byte *ptr = _vm->_fileManager.searchCat(filename, 1);
 
@@ -1773,7 +1773,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode) {
 	if (!mode) {
 		filename = file + ".spr";
 		_vm->_globals.SPRITE_ECRAN = _vm->_globals.freeMemory(_vm->_globals.SPRITE_ECRAN);
-		if (!_vm->_globals.NOSPRECRAN) {
+		if (initializeScreen) {
 			_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.searchCat(filename, 8);
 			if (_vm->_globals.SPRITE_ECRAN) {
 				_vm->_fileManager.constructFilename("LINK", filename);

diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
@@ -163,9 +163,9 @@ class GraphicsManager {
 	void SCOPY(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
 	void Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned int width, int height, byte *destSurface, int destX, int destY);
 	void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
-	void INI_ECRAN(const Common::String &file);
-	void INI_ECRAN2(const Common::String &file);
-	void OPTI_INI(const Common::String &file, int mode);
+	void INI_ECRAN(const Common::String &file, bool initializeScreen);
+	void INI_ECRAN2(const Common::String &file, bool initializeScreen);
+	void OPTI_INI(const Common::String &file, int mode, bool initializeScreen);
 	void NB_SCREEN(bool initPalette);
 	void SHOW_PALETTE();
 	void Copy_WinScan_Vbe(const byte *srcP, byte *destP);