Skip to content

Commit

Permalink
HOPKINS: Remove setParent() from FileManager
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Mar 19, 2013
1 parent db6d7e2 commit f2d4151
Show file tree
Hide file tree
Showing 16 changed files with 91 additions and 94 deletions.
4 changes: 2 additions & 2 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -502,7 +502,7 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
_vm->_globals.Bank[idx]._loadedFl = true;
_vm->_globals.Bank[idx]._filename = filename;

byte *fileDataPtr = _vm->_fileManager.loadFile(filename);
byte *fileDataPtr = _vm->_fileManager->loadFile(filename);

_vm->_globals.Bank[idx]._fileHeader = 0;
if (fileDataPtr[1] == 'L' && fileDataPtr[2] == 'E')
Expand Down Expand Up @@ -543,7 +543,7 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {

Common::File f;
if (f.exists(ofsFilename)) {
byte *ofsData = _vm->_fileManager.loadFile(ofsFilename);
byte *ofsData = _vm->_fileManager->loadFile(ofsFilename);
byte *curOfsData = ofsData;
for (int objIdx = 0; objIdx < _vm->_globals.Bank[idx]._objDataIdx; ++objIdx, curOfsData += 8) {
int x1 = READ_LE_INT16(curOfsData);
Expand Down
20 changes: 10 additions & 10 deletions engines/hopkins/computer.cpp
View file
Expand Up @@ -83,7 +83,7 @@ void ComputerManager::setTextMode() {
Common::File f;
if (!f.exists(filename))
filename = "FONTE.SPR"; // Used by the BeOS and OS/2 versions as an alternative
_vm->_fontManager._font = _vm->_fileManager.loadFile(filename);
_vm->_fontManager._font = _vm->_fileManager->loadFile(filename);
_vm->_fontManager._fontFixedWidth = 8;
_vm->_fontManager._fontFixedHeight = 8;

Expand Down Expand Up @@ -352,8 +352,8 @@ static const char _spanishText[] =
*/
void ComputerManager::loadMenu() {
char *ptr;
if (_vm->_fileManager.fileExists("COMPUTAN.TXT")) {
ptr = (char *)_vm->_fileManager.loadFile("COMPUTAN.TXT");
if (_vm->_fileManager->fileExists("COMPUTAN.TXT")) {
ptr = (char *)_vm->_fileManager->loadFile("COMPUTAN.TXT");
} else if (_vm->_globals._language == LANG_FR) {
ptr = (char *)_vm->_globals.allocMemory(sizeof(_frenchText));
strcpy(ptr, _frenchText);
Expand Down Expand Up @@ -468,7 +468,7 @@ void ComputerManager::outText2(const Common::String &msg) {
*/
void ComputerManager::restoreFBIRoom() {
_vm->_globals.freeMemory(_vm->_fontManager._font);
_vm->_fontManager._font = _vm->_fileManager.loadFile("FONTE3.SPR");
_vm->_fontManager._font = _vm->_fileManager->loadFile("FONTE3.SPR");
_vm->_fontManager._fontFixedWidth = 12;
_vm->_fontManager._fontFixedHeight = 21;

Expand All @@ -489,8 +489,8 @@ void ComputerManager::readText(int idx) {
else if (_vm->_globals._language == LANG_SP)
filename = "THOPKES.TXT";

byte *ptr = _vm->_fileManager.loadFile(filename);
uint16 fileSize = _vm->_fileManager.fileSize(filename);
byte *ptr = _vm->_fileManager->loadFile(filename);
uint16 fileSize = _vm->_fileManager->fileSize(filename);
int pos;
for (pos = 0; pos < fileSize; pos++) {
if (ptr[pos] == '%') {
Expand Down Expand Up @@ -551,7 +551,7 @@ void ComputerManager::displayGamesSubMenu() {
_vm->_soundManager.loadSample(1, "SOUND37.WAV");
_vm->_soundManager.loadSample(2, "SOUND38.WAV");
_vm->_soundManager.loadSample(3, "SOUND39.WAV");
_breakoutSpr = _vm->_fileManager.loadFile("CASSE.SPR");
_breakoutSpr = _vm->_fileManager->loadFile("CASSE.SPR");
loadHiscore();
setModeVGA256();

Expand Down Expand Up @@ -640,7 +640,7 @@ void ComputerManager::newLevel() {
}
f.close();

_breakoutLevel = (int16 *)_vm->_fileManager.loadFile(file);
_breakoutLevel = (int16 *)_vm->_fileManager->loadFile(file);
displayBricks();

_vm->_objectsManager.addStaticSprite(_breakoutSpr, Common::Point(150, 192), 0, 13, 0, false, 0, 0);
Expand Down Expand Up @@ -810,7 +810,7 @@ int ComputerManager::displayHiscores() {
_vm->_graphicsManager.resetDirtyRects();
loadHiscore();
_vm->_graphicsManager.loadVgaImage("HISCORE.PCX");
byte *ptr = _vm->_fileManager.loadFile("ALPHA.SPR");
byte *ptr = _vm->_fileManager->loadFile("ALPHA.SPR");
_vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
Expand Down Expand Up @@ -863,7 +863,7 @@ void ComputerManager::getScoreName() {
_vm->_graphicsManager.SETCOLOR3(253, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
byte *ptr = _vm->_fileManager.loadFile("ALPHA.SPR");
byte *ptr = _vm->_fileManager->loadFile("ALPHA.SPR");
_vm->_graphicsManager.fadeInBreakout();
for (int strPos = 0; strPos <= 4; strPos++) {
displayHiscoreLine(ptr, 9 * strPos + 140, 78, 1);
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -69,7 +69,7 @@ void DialogsManager::showOptionsDialog() {
filename = "OPTIES.SPR";
}

_vm->_globals._optionDialogSpr = _vm->_fileManager.loadFile(filename);
_vm->_globals._optionDialogSpr = _vm->_fileManager->loadFile(filename);
_vm->_globals._optionDialogFl = true;

int scrollOffset = _vm->_graphicsManager._scrollOffset;
Expand Down Expand Up @@ -352,10 +352,10 @@ void DialogsManager::showInventory() {

size_t filesize = f.size();
_inventWin1 = _vm->_globals.allocMemory(filesize);
_vm->_fileManager.readStream(f, _inventWin1, filesize);
_vm->_fileManager->readStream(f, _inventWin1, filesize);
f.close();

_inventBuf2 = _vm->_fileManager.loadFile("INVENT2.SPR");
_inventBuf2 = _vm->_fileManager->loadFile("INVENT2.SPR");

_inventX = _vm->_graphicsManager._scrollOffset + 152;
_inventY = 114;
Expand Down
10 changes: 5 additions & 5 deletions engines/hopkins/events.cpp
View file
Expand Up @@ -80,18 +80,18 @@ void EventsManager::initMouseData() {
switch (_vm->_globals._language) {
case LANG_EN:
if (!_mouseLinuxFl)
_mouseCursor = _vm->_fileManager.loadFile("SOUAN.SPR");
_mouseCursor = _vm->_fileManager->loadFile("SOUAN.SPR");
else
_mouseCursor = _vm->_fileManager.loadFile("LSOUAN.SPR");
_mouseCursor = _vm->_fileManager->loadFile("LSOUAN.SPR");
break;
case LANG_FR:
if (!_mouseLinuxFl)
_mouseCursor = _vm->_fileManager.loadFile("SOUFR.SPR");
_mouseCursor = _vm->_fileManager->loadFile("SOUFR.SPR");
else
_mouseCursor = _vm->_fileManager.loadFile("LSOUFR.SPR");
_mouseCursor = _vm->_fileManager->loadFile("LSOUFR.SPR");
break;
case LANG_SP:
_mouseCursor = _vm->_fileManager.loadFile("SOUES.SPR");
_mouseCursor = _vm->_fileManager->loadFile("SOUES.SPR");
break;
}
}
Expand Down
5 changes: 1 addition & 4 deletions engines/hopkins/files.cpp
View file
Expand Up @@ -33,10 +33,7 @@

namespace Hopkins {

FileManager::FileManager() {
}

void FileManager::setParent(HopkinsEngine *vm) {
FileManager::FileManager(HopkinsEngine *vm) {
_vm = vm;
}

Expand Down
3 changes: 1 addition & 2 deletions engines/hopkins/files.h
View file
Expand Up @@ -41,8 +41,7 @@ class FileManager {
public:
HopkinsEngine *_vm;

FileManager();
void setParent(HopkinsEngine *vm);
FileManager(HopkinsEngine *vm);

bool fileExists(const Common::String &file);
byte *loadFile(const Common::String &file);
Expand Down
8 changes: 4 additions & 4 deletions engines/hopkins/font.cpp
View file
Expand Up @@ -50,13 +50,13 @@ void FontManager::setParent(HopkinsEngine *vm) {
void FontManager::loadZoneText() {
switch (_vm->_globals._language) {
case LANG_EN:
_zoneText = _vm->_fileManager.loadFile("ZONEAN.TXT");
_zoneText = _vm->_fileManager->loadFile("ZONEAN.TXT");
break;
case LANG_FR:
_zoneText = _vm->_fileManager.loadFile("ZONE01.TXT");
_zoneText = _vm->_fileManager->loadFile("ZONE01.TXT");
break;
case LANG_SP:
_zoneText = _vm->_fileManager.loadFile("ZONEES.TXT");
_zoneText = _vm->_fileManager->loadFile("ZONEES.TXT");
break;
}
}
Expand Down Expand Up @@ -90,7 +90,7 @@ void FontManager::clearAll() {
}

void FontManager::initData() {
_font = _vm->_fileManager.loadFile("FONTE3.SPR");
_font = _vm->_fileManager->loadFile("FONTE3.SPR");
_fontFixedWidth = 12;
_fontFixedHeight = 21;
loadZoneText();
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/globals.cpp
View file
Expand Up @@ -316,7 +316,7 @@ void Globals::clearVBob() {

// Load Object
void Globals::loadObjects() {
byte *data = _vm->_fileManager.loadFile("OBJET.DAT");
byte *data = _vm->_fileManager->loadFile("OBJET.DAT");
byte *srcP = data;

for (int idx = 0; idx < 300; ++idx) {
Expand Down Expand Up @@ -394,14 +394,14 @@ void Globals::setHidingUseCount(int idx) {
// Load Hiding Items
void Globals::loadHidingItems(const Common::String &file) {
resetHidingItems();
byte *ptr = _vm->_fileManager.loadFile(file);
byte *ptr = _vm->_fileManager->loadFile(file);
Common::String filename = Common::String((const char *)ptr);

Common::File f;
if (!f.exists(filename))
return;

byte *spriteData = _vm->_fileManager.loadFile(filename);
byte *spriteData = _vm->_fileManager->loadFile(filename);
_hidingItemData[1] = spriteData;
int curBufIdx = 60;
for (int i = 0; i <= 21; i++) {
Expand Down
16 changes: 8 additions & 8 deletions engines/hopkins/graphics.cpp
View file
Expand Up @@ -199,7 +199,7 @@ void GraphicsManager::loadScreen(const Common::String &file) {
assert(!_videoPtr);

bool flag = true;
if (_vm->_fileManager.searchCat(file, RES_PIC) == g_PTRNUL) {
if (_vm->_fileManager->searchCat(file, RES_PIC) == g_PTRNUL) {
if (!f.open(file))
error("loadScreen - %s", file.c_str());

Expand Down Expand Up @@ -1740,20 +1740,20 @@ void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp,

void GraphicsManager::initScreen(const Common::String &file, int mode, bool initializeScreen) {
Common::String filename = file + ".ini";
byte *ptr = _vm->_fileManager.searchCat(filename, RES_INI);
byte *ptr = _vm->_fileManager->searchCat(filename, RES_INI);

if (ptr == g_PTRNUL) {
ptr = _vm->_fileManager.loadFile(filename);
ptr = _vm->_fileManager->loadFile(filename);
}
if (!mode) {
filename = file + ".spr";
_vm->_globals.SPRITE_ECRAN = _vm->_globals.freeMemory(_vm->_globals.SPRITE_ECRAN);
if (initializeScreen) {
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.searchCat(filename, RES_SLI);
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager->searchCat(filename, RES_SLI);
if (_vm->_globals.SPRITE_ECRAN) {
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.loadFile(filename);
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager->loadFile(filename);
} else {
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager.loadFile("RES_SLI.RES");
_vm->_globals.SPRITE_ECRAN = _vm->_fileManager->loadFile("RES_SLI.RES");
}
}
}
Expand Down Expand Up @@ -1784,9 +1784,9 @@ void GraphicsManager::initScreen(const Common::String &file, int mode, bool init
_vm->_globals._answerBuffer = _vm->_globals.freeMemory(_vm->_globals._answerBuffer);

filename = file + ".rep";
byte *dataP = _vm->_fileManager.searchCat(filename, RES_REP);
byte *dataP = _vm->_fileManager->searchCat(filename, RES_REP);
if (dataP == g_PTRNUL)
dataP = _vm->_fileManager.loadFile(filename);
dataP = _vm->_fileManager->loadFile(filename);

_vm->_globals._answerBuffer = dataP;
_vm->_objectsManager._forceZoneFl = true;
Expand Down
29 changes: 15 additions & 14 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -45,8 +45,8 @@ HopkinsEngine::HopkinsEngine(OSystem *syst, const HopkinsGameDescription *gameDe
_dialogsManager = new DialogsManager(this);
_debugger = new Debugger(this);
_eventsManager = new EventsManager(this);
_fileManager = new FileManager(this);

_fileManager.setParent(this);
_fontManager.setParent(this);
_globals.setParent(this);
_graphicsManager.setParent(this);
Expand All @@ -60,6 +60,7 @@ HopkinsEngine::HopkinsEngine(OSystem *syst, const HopkinsGameDescription *gameDe
}

HopkinsEngine::~HopkinsEngine() {
delete _fileManager;
delete _eventsManager;
delete _debugger;
delete _dialogsManager;
Expand Down Expand Up @@ -103,7 +104,7 @@ Common::Error HopkinsEngine::run() {
_saveLoadManager.initSaves();

_globals.setConfig();
_fileManager.initCensorship();
_fileManager->initCensorship();
initializeSystem();

if (!getIsDemo())
Expand Down Expand Up @@ -155,7 +156,7 @@ bool HopkinsEngine::runWin95Demo() {
_globals._speed = 3;
_graphicsManager.fadeOutLong();
_globals.iRegul = 1;
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
_objectsManager._mapCarPosX = _objectsManager._mapCarPosY = 0;
memset(_globals._saveData, 0, 2000);
Expand Down Expand Up @@ -445,7 +446,7 @@ bool HopkinsEngine::runLinuxDemo() {
playIntro();

_globals.iRegul = 0;
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
_objectsManager._mapCarPosX = _objectsManager._mapCarPosY = 0;
memset(_globals._saveData, 0, 2000);
Expand Down Expand Up @@ -809,7 +810,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager.fadeOutLong();
}
_globals.iRegul = 0;
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
_objectsManager._mapCarPosX = _objectsManager._mapCarPosY = 0;
memset(_globals._saveData, 0, 2000);
Expand Down Expand Up @@ -1536,7 +1537,7 @@ bool HopkinsEngine::runFull() {
_globals._exitId = handleBaseMap(); // Handles the base map (non-Windows)
//_globals._exitId = WBASE(); // Handles the 3D Doom level (Windows)
_soundManager.stopSound();
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
_globals.iRegul = 0;
_graphicsManager._lineNbr = SCREEN_WIDTH;
Expand Down Expand Up @@ -1583,8 +1584,8 @@ void HopkinsEngine::initializeSystem() {
_eventsManager->initMouseData();
_fontManager.initData();

_dialogsManager->_inventoryIcons = _fileManager.loadFile("ICONE.SPR");
_objectsManager._headSprites = _fileManager.loadFile("TETE.SPR");
_dialogsManager->_inventoryIcons = _fileManager->loadFile("ICONE.SPR");
_objectsManager._headSprites = _fileManager->loadFile("TETE.SPR");

_eventsManager->setMouseOn();
_eventsManager->_mouseFl = false;
Expand Down Expand Up @@ -2196,7 +2197,7 @@ void HopkinsEngine::playEnding() {
_globals.iRegul = 0;
_globals._exitId = 300;
}
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
_globals.iRegul = 0;
}
Expand Down Expand Up @@ -2382,13 +2383,13 @@ void HopkinsEngine::loadCredits() {
byte *bufPtr;
switch (_globals._language) {
case LANG_EN:
bufPtr = _fileManager.loadFile("CREAN.TXT");
bufPtr = _fileManager->loadFile("CREAN.TXT");
break;
case LANG_FR:
bufPtr = _fileManager.loadFile("CREFR.TXT");
bufPtr = _fileManager->loadFile("CREFR.TXT");
break;
case LANG_SP:
bufPtr = _fileManager.loadFile("CREES.TXT");
bufPtr = _fileManager->loadFile("CREES.TXT");
break;
default:
error("Unhandled language");
Expand Down Expand Up @@ -2750,7 +2751,7 @@ void HopkinsEngine::handleOceanMaze(int16 curExitId, Common::String backgroundFi
_globals._exitId = 0;
_globals._disableInventFl = true;
_soundManager.playSound(soundId);
_globals.PERSO = _fileManager.loadFile("VAISSEAU.SPR");
_globals.PERSO = _fileManager->loadFile("VAISSEAU.SPR");
if (backgroundFilename.size())
_graphicsManager.loadImage(backgroundFilename);

Expand Down Expand Up @@ -2837,7 +2838,7 @@ void HopkinsEngine::handleOceanMaze(int16 curExitId, Common::String backgroundFi
_graphicsManager.fadeOutLong();
_objectsManager.removeSprite(0);
_objectsManager.clearScreen();
_globals.PERSO = _fileManager.loadFile("PERSO.SPR");
_globals.PERSO = _fileManager->loadFile("PERSO.SPR");
_globals._characterType = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/hopkins.h
View file
Expand Up @@ -147,10 +147,10 @@ class HopkinsEngine : public Engine {
DialogsManager *_dialogsManager;
Debugger *_debugger;
EventsManager *_eventsManager;
FileManager *_fileManager;

FontManager _fontManager;
Globals _globals;
FileManager _fileManager;
GraphicsManager _graphicsManager;
LinesManager _linesManager;
MenuManager _menuManager;
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/lines.cpp
View file
Expand Up @@ -111,7 +111,7 @@ void LinesManager::loadLines(const Common::String &file) {
resetLines();
_linesNumb = 0;
_lastLine = 0;
byte *ptr = _vm->_fileManager.loadFile(file);
byte *ptr = _vm->_fileManager->loadFile(file);
for (int idx = 0; READ_LE_INT16((uint16 *)ptr + (idx * 5)) != -1; idx++) {
addLine(idx,
(Directions)READ_LE_INT16((uint16 *)ptr + (idx * 5)),
Expand Down

0 comments on commit f2d4151

Please sign in to comment.