diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/dreamweb.h | 2 | ||||
-rw-r--r-- | engines/dreamweb/keypad.cpp | 20 | ||||
-rw-r--r-- | engines/dreamweb/monitor.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/newplace.cpp | 8 | ||||
-rw-r--r-- | engines/dreamweb/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 13 | ||||
-rw-r--r-- | engines/dreamweb/titles.cpp | 2 |
7 files changed, 26 insertions, 25 deletions
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 54646ba702..762d6387a6 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -809,7 +809,7 @@ public: uint8 findNextColon(const uint8 **string); void allocateBuffers(); void loadTextFile(TextFile &file, const char *fileName); - void loadGraphicsFile(GraphicsFile &file, const char *fileName); + void loadGraphicsFile(GraphicsFile &file, const char *suffix); void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len); void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len); void loadTravelText(); diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp index 16729275c1..2ab5835997 100644 --- a/engines/dreamweb/keypad.cpp +++ b/engines/dreamweb/keypad.cpp @@ -108,7 +108,7 @@ bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 d } void DreamWebEngine::loadKeypad() { - loadGraphicsFile(_keypadGraphics, "DREAMWEB.G02"); + loadGraphicsFile(_keypadGraphics, "G02"); } void DreamWebEngine::quitKey() { @@ -293,8 +293,8 @@ void DreamWebEngine::showMenu() { } void DreamWebEngine::loadMenu() { - loadGraphicsFile(_menuGraphics, "DREAMWEB.S02"); // sprite name 3 - loadGraphicsFile(_menuGraphics2, "DREAMWEB.G07"); // mon. graphics 2 + loadGraphicsFile(_menuGraphics, "S02"); // sprite name 3 + loadGraphicsFile(_menuGraphics2, "G07"); // mon. graphics 2 } void DreamWebEngine::viewFolder() { @@ -394,10 +394,10 @@ void DreamWebEngine::checkFolderCoords() { } void DreamWebEngine::loadFolder() { - loadGraphicsFile(_folderGraphics, "DREAMWEB.G09"); // folder graphics 1 - loadGraphicsFile(_folderGraphics2, "DREAMWEB.G10"); // folder graphics 2 - loadGraphicsFile(_folderGraphics3, "DREAMWEB.G11"); // folder graphics 3 - loadGraphicsFile(_folderCharset, "DREAMWEB.C02"); // character set 3 + loadGraphicsFile(_folderGraphics, "G09"); // folder graphics 1 + loadGraphicsFile(_folderGraphics2, "G10"); // folder graphics 2 + loadGraphicsFile(_folderGraphics3, "G11"); // folder graphics 3 + loadGraphicsFile(_folderCharset, "C02"); // character set 3 loadTempText("T50"); // folder text } @@ -491,7 +491,7 @@ void DreamWebEngine::showRightPage() { void DreamWebEngine::enterSymbol() { _manIsOffScreen = 1; getRidOfReels(); - loadGraphicsFile(_symbolGraphics, "DREAMWEB.G12"); // symbol graphics + loadGraphicsFile(_symbolGraphics, "G12"); // symbol graphics _symbolTopX = 24; _symbolTopDir = 0; _symbolBotX = 24; @@ -716,9 +716,9 @@ void DreamWebEngine::updateSymbolBot() { void DreamWebEngine::useDiary() { getRidOfReels(); - loadGraphicsFile(_diaryGraphics, "DREAMWEB.G14"); + loadGraphicsFile(_diaryGraphics, "G14"); loadTempText("T51"); - loadGraphicsFile(_diaryCharset, "DREAMWEB.C02"); + loadGraphicsFile(_diaryCharset, "C02"); createPanel(); showIcon(); showDiary(); diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp index f5f064f855..61c23cda0e 100644 --- a/engines/dreamweb/monitor.cpp +++ b/engines/dreamweb/monitor.cpp @@ -54,11 +54,11 @@ void DreamWebEngine::useMon() { showIcon(); drawFloor(); getRidOfAll(); - loadGraphicsFile(_monitorGraphics, "DREAMWEB.G03"); // mon. graphic name + loadGraphicsFile(_monitorGraphics, "G03"); // mon. graphic name loadPersonal(); loadNews(); loadCart(); - loadGraphicsFile(_monitorCharset, "DREAMWEB.C01"); // character set 2 + loadGraphicsFile(_monitorCharset, "C01"); // character set 2 printOuterMon(); initialMonCols(); printLogo(); diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp index c484855da4..529c45bd4a 100644 --- a/engines/dreamweb/newplace.cpp +++ b/engines/dreamweb/newplace.cpp @@ -259,13 +259,13 @@ void DreamWebEngine::resetLocation(uint8 index) { } void DreamWebEngine::readDestIcon() { - loadGraphicsFile(_newplaceGraphics, "DREAMWEB.G05"); - loadGraphicsFile(_newplaceGraphics2, "DREAMWEB.G06"); - loadGraphicsFile(_newplaceGraphics3, "DREAMWEB.G08"); + loadGraphicsFile(_newplaceGraphics, "G05"); + loadGraphicsFile(_newplaceGraphics2, "G06"); + loadGraphicsFile(_newplaceGraphics3, "G08"); } void DreamWebEngine::readCityPic() { - loadGraphicsFile(_cityGraphics, "DREAMWEB.G04"); + loadGraphicsFile(_cityGraphics, "G04"); } } // End of namespace DreamWeb diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp index acc76572ef..a526c8a3bc 100644 --- a/engines/dreamweb/saveload.cpp +++ b/engines/dreamweb/saveload.cpp @@ -708,7 +708,7 @@ void DreamWebEngine::showDecisions() { } void DreamWebEngine::loadSaveBox() { - loadGraphicsFile(_saveGraphics, "DREAMWEB.G08"); + loadGraphicsFile(_saveGraphics, "G08"); } // show savegame names (original interface), and set kCursorpos diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index caa5fc8f7f..e195ef3726 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -834,7 +834,8 @@ void DreamWebEngine::switchRyanOff() { _vars._ryanOn = 1; } -void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName) { +void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *suffix) { + Common::String fileName = getDatafilePrefix() + suffix; FileHeader header; Common::File f; @@ -1991,10 +1992,10 @@ void DreamWebEngine::loadRoom() { } void DreamWebEngine::readSetData() { - loadGraphicsFile(_charset1, "DREAMWEB.C00"); - loadGraphicsFile(_icons1, "DREAMWEB.G00"); - loadGraphicsFile(_icons2, "DREAMWEB.G01"); - loadGraphicsFile(_mainSprites, "DREAMWEB.S00"); + loadGraphicsFile(_charset1, "C00"); + loadGraphicsFile(_icons1, "G00"); + loadGraphicsFile(_icons2, "G01"); + loadGraphicsFile(_mainSprites, "S00"); loadTextFile(_puzzleText, "DREAMWEB.T80"); loadTextFile(_commandText, "DREAMWEB.T84"); useCharset1(); @@ -2781,7 +2782,7 @@ void DreamWebEngine::showGun() { loadRoomsSample(); _volume = 0; GraphicsFile graphics; - loadGraphicsFile(graphics, "DREAMWEB.G13"); + loadGraphicsFile(graphics, "G13"); createPanel2(); showFrame(graphics, 100, 4, 0, 0); showFrame(graphics, 158, 106, 1, 0); diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp index 146503dcdf..f7486ce687 100644 --- a/engines/dreamweb/titles.cpp +++ b/engines/dreamweb/titles.cpp @@ -41,7 +41,7 @@ void DreamWebEngine::monkSpeaking() { _roomsSample = 35; loadRoomsSample(); GraphicsFile graphics; - loadGraphicsFile(graphics, "DREAMWEB.G15"); + loadGraphicsFile(graphics, "G15"); clearWork(); showFrame(graphics, 160, 72, 0, 128); // show monk workToScreen(); |