1 files changed, 8 insertions, 16 deletions

diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 0021f3539e..aaf5962cac 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -163,8 +163,7 @@ void GraphicsManager::loadVgaImage(const Common::String &file) {
 	lockScreen();
 	clearScreen();
 	unlockScreen();
-	_vm->_fileManager.constructFilename("BUFFER", file);
-	A_PCX320(_vesaScreen, _vm->_globals._curFilename, _palette);
+	A_PCX320(_vesaScreen, file, _palette);
 	memcpy(_vesaBuffer, _vesaScreen, 64000);
 	SCANLINE(320);
 	max_x = 320;
@@ -184,8 +183,7 @@ void GraphicsManager::loadScreen(const Common::String &file) {
 
 	bool flag = true;
 	if (_vm->_fileManager.searchCat(file, 6) == g_PTRNUL) {
-		_vm->_fileManager.constructFilename("BUFFER", file);
-		if (!f.open(_vm->_globals._curFilename))
+		if (!f.open(file))
 			error("loadScreen - %s", file.c_str());
 
 		f.seek(0, SEEK_END);
@@ -301,15 +299,12 @@ void GraphicsManager::A_PCX640_480(byte *surface, const Common::String &file, by
 
 	if (typeFlag) {
 		// Load PCX from within the PIC resource
-		_vm->_fileManager.constructFilename("BUFFER", "PIC.RES");
-		if (!f.open(_vm->_globals._curFilename))
+		if (!f.open("PIC.RES"))
 			error("Error opening PIC.RES.");
 		f.seek(_vm->_globals._catalogPos);
-
 	} else {
 		// Load stand alone PCX file
-		_vm->_fileManager.constructFilename("BUFFER", file);
-		if (!f.open(_vm->_globals._curFilename))
+		if (!f.open(file))
 		  error("Error opening PCX %s.", file.c_str());
 	}
 
@@ -1767,8 +1762,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initia
 	byte *ptr = _vm->_fileManager.searchCat(filename, 1);
 
 	if (ptr == g_PTRNUL) {
-		_vm->_fileManager.constructFilename("LINK", filename);
-		ptr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
+		ptr = _vm->_fileManager.loadFile(filename);
 	}
 	if (!mode) {
 		filename = file + ".spr";
@@ -1776,11 +1770,10 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initia
 		if (initializeScreen) {
 			_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.searchCat(filename, 8);
 			if (_vm->_globals.SPRITE_ECRAN) {
-				_vm->_fileManager.constructFilename("LINK", filename);
+				_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.loadFile(filename);
 			} else {
-				_vm->_fileManager.constructFilename("LINK", "RES_SLI.RES");
+				_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.loadFile("RES_SLI.RES");
 			}
-			_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
 		}
 	}
 	if (ptr[0] != 'I' || ptr[1] != 'N' || ptr[2] != 'I') {
@@ -1814,8 +1807,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int mode, bool initia
 		byte *dataP = _vm->_fileManager.searchCat(filename, 2);
 		_vm->_globals.COUCOU = dataP;
 		if (g_PTRNUL == dataP) {
-			_vm->_fileManager.constructFilename("LINK", filename);
-			dataP = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
+			dataP = _vm->_fileManager.loadFile(filename);
 			_vm->_globals.COUCOU = dataP;
 		}
 	}