diff options
author | D G Turner | 2012-02-24 05:19:29 +0000 |
---|---|---|
committer | D G Turner | 2012-02-24 15:04:10 +0000 |
commit | 31bf535a83682d6ad1616b8862119edbb95429c1 (patch) | |
tree | 8c34e32db678b051f26a3cd6d690cad9f46998fa /engines | |
parent | 542014c309cb713ee5f550f344065fa9124f17bd (diff) | |
download | scummvm-rg350-31bf535a83682d6ad1616b8862119edbb95429c1.tar.gz scummvm-rg350-31bf535a83682d6ad1616b8862119edbb95429c1.tar.bz2 scummvm-rg350-31bf535a83682d6ad1616b8862119edbb95429c1.zip |
DREAMWEB: Migrate loadTempText() to using datafile prefix variable.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/dreamweb.h | 2 | ||||
-rw-r--r-- | engines/dreamweb/keypad.cpp | 4 | ||||
-rw-r--r-- | engines/dreamweb/people.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 7 | ||||
-rw-r--r-- | engines/dreamweb/titles.cpp | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 1ea16c24ed..40ae05bd8a 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -813,7 +813,7 @@ public: void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len); void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len); void loadTravelText(); - void loadTempText(const char *fileName); + void loadTempText(const char *suffix); void sortOutMap(); void loadRoomData(const Room &room, bool skipDat); void useTempCharset(GraphicsFile *charset); diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp index 172e85104f..16729275c1 100644 --- a/engines/dreamweb/keypad.cpp +++ b/engines/dreamweb/keypad.cpp @@ -398,7 +398,7 @@ void DreamWebEngine::loadFolder() { loadGraphicsFile(_folderGraphics2, "DREAMWEB.G10"); // folder graphics 2 loadGraphicsFile(_folderGraphics3, "DREAMWEB.G11"); // folder graphics 3 loadGraphicsFile(_folderCharset, "DREAMWEB.C02"); // character set 3 - loadTempText("DREAMWEB.T50"); // folder text + loadTempText("T50"); // folder text } void DreamWebEngine::showFolder() { @@ -717,7 +717,7 @@ void DreamWebEngine::updateSymbolBot() { void DreamWebEngine::useDiary() { getRidOfReels(); loadGraphicsFile(_diaryGraphics, "DREAMWEB.G14"); - loadTempText("DREAMWEB.T51"); + loadTempText("T51"); loadGraphicsFile(_diaryCharset, "DREAMWEB.C02"); createPanel(); showIcon(); diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index 1b8ee1b4de..316a1689c9 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -178,7 +178,7 @@ void DreamWebEngine::madman(ReelRoutine &routine) { return; } if (newReelPointer == 10) { - loadTempText("DREAMWEB.T82"); + loadTempText("T82"); _vars._combatCount = (uint8)-1; _speechCount = 0; } diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp index 763bcb88fe..89c9aa8d38 100644 --- a/engines/dreamweb/stubs.cpp +++ b/engines/dreamweb/stubs.cpp @@ -2238,8 +2238,9 @@ void DreamWebEngine::loadTravelText() { loadTextFile(_travelText, "DREAMWEB.T81"); // location descs } -void DreamWebEngine::loadTempText(const char *fileName) { - loadTextFile(_textFile1, fileName); +void DreamWebEngine::loadTempText(const char *suffix) { + Common::String fileName = getDatafilePrefix() + suffix; + loadTextFile(_textFile1, fileName.c_str()); } void DreamWebEngine::drawFloor() { @@ -2789,7 +2790,7 @@ void DreamWebEngine::showGun() { fadeScreenUp(); hangOn(160); playChannel0(12, 0); - loadTempText("DREAMWEB.T83"); + loadTempText("T83"); rollEndCreditsGameLost(); getRidOfTempText(); } diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp index 0059b19605..146503dcdf 100644 --- a/engines/dreamweb/titles.cpp +++ b/engines/dreamweb/titles.cpp @@ -26,7 +26,7 @@ namespace DreamWeb { void DreamWebEngine::endGame() { - loadTempText("DREAMWEB.T83"); + loadTempText("T83"); monkSpeaking(); if (_quitRequested) return; @@ -141,7 +141,7 @@ void DreamWebEngine::hangOne(uint16 delay) { } void DreamWebEngine::intro() { - loadTempText("DREAMWEB.T82"); + loadTempText("T82"); loadPalFromIFF(); setMode(); _newLocation = 50; |