Skip to content

Commit

Permalink
HOPKINS: Some more renaming and refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Dec 28, 2012
1 parent c07beb6 commit c934363
Show file tree
Hide file tree
Showing 14 changed files with 454 additions and 465 deletions.
38 changes: 19 additions & 19 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -64,8 +64,8 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
ptr = _vm->_globals.allocMemory(20);

_vm->_fileManager.constructFilename(_vm->_globals.HOPANM, filename);
if (!f.open(_vm->_globals.NFICHIER))
error("File not found - %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("File not found - %s", _vm->_globals._curFilename.c_str());

f.skip(6);
f.read(_vm->_graphicsManager._palette, 800);
Expand Down Expand Up @@ -237,18 +237,18 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint
_vm->_fileManager.constructLinuxFilename("TEMP.SCR");

if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH)
_vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200);
_vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200);
else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2))
_vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400);
_vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400);
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager.ofscroll = 0;

v12 = _vm->_graphicsManager._vesaScreen;
v13 = _vm->_globals.allocMemory(20);
_vm->_fileManager.constructFilename(_vm->_globals.HOPANM, filename);

if (!f.open(_vm->_globals.NFICHIER))
error("Error opening file - %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("Error opening file - %s", _vm->_globals._curFilename.c_str());

f.read(&buf, 6);
f.read(_vm->_graphicsManager._palette, 800);
Expand Down Expand Up @@ -556,8 +556,8 @@ void AnimationManager::loadAnim(const Common::String &animName) {
_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename);

Common::File f;
if (!f.open(_vm->_globals.NFICHIER))
error("Failed to open %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("Failed to open %s", _vm->_globals._curFilename.c_str());

int filesize = f.size();
int nbytes = filesize - 115;
Expand All @@ -580,7 +580,7 @@ void AnimationManager::loadAnim(const Common::String &animName) {
if (files[idx][0]) {
_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, files[idx]);

if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
error("File not found");
if (loadSpriteBank(idx + 1, files[idx]))
error("File not compatible with this soft.");
Expand Down Expand Up @@ -626,11 +626,11 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {
byte *v19;
int result = 0;
_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, filename);
_vm->_globals.Bank[idx].field1C = _vm->_fileManager.fileSize(_vm->_globals.NFICHIER);
_vm->_globals.Bank[idx].field1C = _vm->_fileManager.fileSize(_vm->_globals._curFilename);
_vm->_globals.Bank[idx].field4 = 1;
_vm->_globals.Bank[idx]._filename = filename;

v3 = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
v3 = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
v4 = v3;

_vm->_globals.Bank[idx]._fileHeader = 0;
Expand Down Expand Up @@ -672,8 +672,8 @@ int AnimationManager::loadSpriteBank(int idx, const Common::String &filename) {

_vm->_fileManager.constructFilename(_vm->_globals.HOPANIM, ofsFilename);
Common::File f;
if (f.exists(_vm->_globals.NFICHIER)) {
v19 = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
if (f.exists(_vm->_globals._curFilename)) {
v19 = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
v13 = v19;
for (int objIdx = 0; objIdx < _vm->_globals.Bank[idx].field1A; ++objIdx, v13 += 8) {
int x1 = (int16)READ_LE_UINT16(v13);
Expand Down Expand Up @@ -822,17 +822,17 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui

_vm->_fileManager.constructLinuxFilename("TEMP.SCR");
if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH)
_vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 307200);
_vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 307200);
else if (_vm->_graphicsManager._lineNbr == (SCREEN_WIDTH * 2))
_vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, _vm->_graphicsManager._vesaScreen, 614400);
_vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, _vm->_graphicsManager._vesaScreen, 614400);
if (!_vm->_graphicsManager._lineNbr)
_vm->_graphicsManager.ofscroll = 0;
}
v9 = _vm->_graphicsManager._vesaScreen;
v10 = _vm->_globals.allocMemory(22);
_vm->_fileManager.constructFilename(_vm->_globals.HOPSEQ, file);
if (!f.open(_vm->_globals.NFICHIER))
error("Error opening file - %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("Error opening file - %s", _vm->_globals._curFilename.c_str());

f.skip(6);
f.read(_vm->_graphicsManager._palette, 800);
Expand Down Expand Up @@ -989,8 +989,8 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
v11 = _vm->_globals.allocMemory(22);
_vm->_fileManager.constructFilename(_vm->_globals.HOPSEQ, file);

if (!f.open(_vm->_globals.NFICHIER))
error("File not found - %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("File not found - %s", _vm->_globals._curFilename.c_str());

f.skip(6);
f.read(_vm->_graphicsManager._palette, 800);
Expand Down
24 changes: 12 additions & 12 deletions engines/hopkins/computer.cpp
View file
Expand Up @@ -79,7 +79,7 @@ void ComputerManager::setTextMode() {
_vm->_graphicsManager._lineNbr = SCREEN_WIDTH;
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "STFONT.SPR");
_vm->_globals.police = _vm->_globals.freeMemory(_vm->_globals.police);
_vm->_globals.police = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_vm->_globals.police = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
_vm->_globals.police_l = 8;
_vm->_globals.police_h = 8;
_vm->_graphicsManager.loadImage("WINTEXT");
Expand Down Expand Up @@ -291,7 +291,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
*/
void ComputerManager::loadMenu() {
_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, "COMPUTAN.TXT");
byte *ptr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
byte *ptr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
byte *tmpPtr = ptr;
int lineNum = 0;
int strPos;
Expand Down Expand Up @@ -472,7 +472,7 @@ void ComputerManager::outText2(const Common::String &msg) {
void ComputerManager::restoreFBIRoom() {
_vm->_globals.police = _vm->_globals.freeMemory(_vm->_globals.police);
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "FONTE3.SPR");
_vm->_globals.police = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_vm->_globals.police = _vm->_fileManager.loadFile(_vm->_globals._curFilename);

_vm->_globals.police_l = 12;
_vm->_globals.police_h = 21;
Expand Down Expand Up @@ -506,8 +506,8 @@ void ComputerManager::readText(int idx) {
else if (_vm->_globals._language == LANG_SP)
_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, "THOPKES.TXT");

ptr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
v1 = _vm->_fileManager.fileSize(_vm->_globals.NFICHIER);
ptr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
v1 = _vm->_fileManager.fileSize(_vm->_globals._curFilename);
v2 = 0;
v3 = 0;
if (v1 > 0u) {
Expand Down Expand Up @@ -584,7 +584,7 @@ void ComputerManager::displayGamesSubMenu() {
_vm->_soundManager.loadSample(2, "SOUND38.WAV");
_vm->_soundManager.loadSample(3, "SOUND39.WAV");
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "CASSE.SPR");
_breakoutSpr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_breakoutSpr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
loadHiscore();
setModeVGA256();
newLevel();
Expand Down Expand Up @@ -617,7 +617,7 @@ void ComputerManager::loadHiscore() {

_vm->_fileManager.constructLinuxFilename("HISCORE.DAT");
ptr = _vm->_globals.allocMemory(100);
_vm->_saveLoadManager.load(_vm->_globals.NFICHIER, ptr);
_vm->_saveLoadManager.load(_vm->_globals._curFilename, ptr);

for (int scoreIndex = 0; scoreIndex < 6; ++scoreIndex) {
for (int i = 0; i < 5; ++i) {
Expand Down Expand Up @@ -671,14 +671,14 @@ void ComputerManager::newLevel() {
file = Common::String::format("TAB%d.TAB", _breakoutLevelNbr);

_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, file);
if (f.open(_vm->_globals.NFICHIER))
if (f.open(_vm->_globals._curFilename))
break;

_breakoutLevelNbr = 1;
}
f.close();

_breakoutLevel = (int16 *)_vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_breakoutLevel = (int16 *)_vm->_fileManager.loadFile(_vm->_globals._curFilename);
displayBricks();
_vm->_objectsManager.SPRITE(_breakoutSpr, Common::Point(150, 192), 0, 13, 0, 0, 0, 0);
_vm->_objectsManager.SPRITE(_breakoutSpr, Common::Point(164, 187), 1, 14, 0, 0, 0, 0);
Expand Down Expand Up @@ -860,7 +860,7 @@ int ComputerManager::displayHiscores() {
loadHiscore();
_vm->_graphicsManager.loadVgaImage("HISCORE.PCX");
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "ALPHA.SPR");
ptr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
ptr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
_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 @@ -915,7 +915,7 @@ void ComputerManager::getScoreName() {
_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "ALPHA.SPR");
ptr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
ptr = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
_vm->_graphicsManager.fadeInBreakout();
for (int strPos = 0; strPos <= 4; strPos++) {
displayHiscoreLine(ptr, 9 * strPos + 140, 78, 1);
Expand Down Expand Up @@ -1075,7 +1075,7 @@ void ComputerManager::saveScore() {
}

_vm->_fileManager.constructLinuxFilename("HISCORE.DAT");
_vm->_saveLoadManager.saveFile(_vm->_globals.NFICHIER, ptr, 100);
_vm->_saveLoadManager.saveFile(_vm->_globals._curFilename, ptr, 100);
_vm->_globals.freeMemory(ptr);
}

Expand Down
12 changes: 6 additions & 6 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -66,7 +66,7 @@ void DialogsManager::showOptionsDialog() {
else if (_vm->_globals._language == LANG_SP)
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "OPTIES.SPR");

_vm->_globals.OPTION_SPR = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_vm->_globals.OPTION_SPR = _vm->_fileManager.loadFile(_vm->_globals._curFilename);
_vm->_globals._optionDialogFl = true;

do {
Expand Down Expand Up @@ -327,16 +327,16 @@ void DialogsManager::showInventory() {
}

Common::File f;
if (!f.open(_vm->_globals.NFICHIER))
error("Error opening file - %s", _vm->_globals.NFICHIER.c_str());
if (!f.open(_vm->_globals._curFilename))
error("Error opening file - %s", _vm->_globals._curFilename.c_str());

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

_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "INVENT2.SPR");
_inventBuf2 = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
_inventBuf2 = _vm->_fileManager.loadFile(_vm->_globals._curFilename);

int v19 = _inventX = _vm->_graphicsManager.ofscroll + 152;
_inventY = 114;
Expand Down Expand Up @@ -634,9 +634,9 @@ void DialogsManager::showSaveLoad(int a1) {
break;
}

_vm->_objectsManager.SL_SPR = _vm->_objectsManager.loadSprite(_vm->_globals.NFICHIER);
_vm->_objectsManager.SL_SPR = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename);
_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "SAVE2.SPR");
_vm->_objectsManager.SL_SPR2 = _vm->_objectsManager.loadSprite(_vm->_globals.NFICHIER);
_vm->_objectsManager.SL_SPR2 = _vm->_objectsManager.loadSprite(_vm->_globals._curFilename);
_vm->_graphicsManager.Sprite_Vesa(_vm->_graphicsManager._vesaBuffer, _vm->_objectsManager.SL_SPR, _vm->_eventsManager._startPos.x + 483, 360, 0);

if (_vm->_globals._language == LANG_FR) {
Expand Down
44 changes: 22 additions & 22 deletions engines/hopkins/files.cpp
View file
Expand Up @@ -74,7 +74,7 @@ void FileManager::initCensorship() {
// If file doesn't exist, fallback to uncensored
if (!fileExists(_vm->_globals.HOPSYSTEM, "BLOOD.DAT")) {
constructFilename(_vm->_globals.HOPSYSTEM, "BLOOD.DAT");
char *data = (char *)loadFile(_vm->_globals.NFICHIER);
char *data = (char *)loadFile(_vm->_globals._curFilename);

if (*(data + 6) == 'u' && *(data + 7) == 'k')
_vm->_globals.CENSURE = true;
Expand Down Expand Up @@ -118,14 +118,14 @@ void FileManager::constructFilename(const Common::String &folder, const Common::
}
}

_vm->_globals.NFICHIER = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
_vm->_globals._curFilename = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str());
}

/**
* Construct Linux filename
*/
Common::String FileManager::constructLinuxFilename(const Common::String &file) {
_vm->_globals.NFICHIER = file;
_vm->_globals._curFilename = file;
return file;
}

Expand Down Expand Up @@ -153,71 +153,71 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
switch (a2) {
case 1:
constructFilename(_vm->_globals.HOPLINK, "RES_INI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
constructFilename(_vm->_globals.HOPLINK, "RES_INI.RES");
break;

case 2:
constructFilename(_vm->_globals.HOPLINK, "RES_REP.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
constructFilename(_vm->_globals.HOPLINK, "RES_REP.RES");
break;

case 3:
constructFilename(_vm->_globals.HOPLINK, "RES_LIN.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
constructFilename(_vm->_globals.HOPLINK, "RES_LIN.RES");
break;

case 4:
constructFilename(_vm->_globals.HOPANIM, "RES_ANI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
constructFilename(_vm->_globals.HOPANIM, "RES_ANI.RES");
break;

case 5:
constructFilename(_vm->_globals.HOPANIM, "RES_PER.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
constructFilename(_vm->_globals.HOPANIM, "RES_PER.RES");
break;

case 6:
constructFilename(_vm->_globals.HOPIMAGE, "PIC.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
break;

case 7:
constructFilename(_vm->_globals.HOPANIM, "RES_SAN.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
break;

case 8:
constructFilename(_vm->_globals.HOPLINK, "RES_SLI.CAT");
if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
break;

case 9:
Expand All @@ -238,10 +238,10 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {
}
}

if (!f.exists(_vm->_globals.NFICHIER))
if (!f.exists(_vm->_globals._curFilename))
return g_PTRNUL;

ptr = loadFile(_vm->_globals.NFICHIER);
ptr = loadFile(_vm->_globals._curFilename);
break;
// Deliberate fall-through to
default:
Expand Down Expand Up @@ -276,7 +276,7 @@ byte *FileManager::searchCat(const Common::String &file, int a2) {

// TODO: Double check whether this really should be an unsigned int comparison
if ((uint16)(a2 - 6) > 1 && (uint16)(a2 - 8) > 1) {
if (!f.open(_vm->_globals.NFICHIER))
if (!f.open(_vm->_globals._curFilename))
error("CHARGE_FICHIER");

f.seek(_vm->_globals._catalogPos);
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/font.cpp
View file
Expand Up @@ -170,7 +170,7 @@ void FontManager::box(int idx, int messageId, const Common::String &filename, in
_text[idx]._textLoadedFl = true;
_vm->_fileManager.constructFilename(_vm->_globals.HOPLINK, filename);

file = _vm->_globals.NFICHIER;
file = _vm->_globals._curFilename;
if (strncmp(file.c_str(), _oldName.c_str(), strlen(file.c_str())) != 0) {
// Starting to access a new file, so read in the index file for the file
_oldName = file;
Expand Down

0 comments on commit c934363

Please sign in to comment.