diff options
| author | Strangerke | 2015-12-20 16:02:35 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:35:31 +0100 |
| commit | ae9c2fea51adb1e5b713683e1fadfbb11558c267 (patch) | |
| tree | ebd53caa4aca07f39bed4afc9f103754043d9f14 /engines/lab/dispman.cpp | |
| parent | a4d3bda5c179fd1019f0812f04e6913fba863c28 (diff) | |
| download | scummvm-rg350-ae9c2fea51adb1e5b713683e1fadfbb11558c267.tar.gz scummvm-rg350-ae9c2fea51adb1e5b713683e1fadfbb11558c267.tar.bz2 scummvm-rg350-ae9c2fea51adb1e5b713683e1fadfbb11558c267.zip | |
LAB: Replace char* by Common::String in several functions
Diffstat (limited to 'engines/lab/dispman.cpp')
| -rw-r--r-- | engines/lab/dispman.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp index bb07ba3f66..32c33885af 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -70,15 +70,15 @@ DisplayMan::~DisplayMan() { } // From readPict.c. Reads in pictures and animations from disk. -void DisplayMan::loadPict(const char *filename) { +void DisplayMan::loadPict(const Common::String filename) { freePict(); _curBitmap = _vm->_resource->openDataFile(filename); } -void DisplayMan::loadBackPict(const char *fileName, uint16 *highPal) { +void DisplayMan::loadBackPict(const Common::String fileName, uint16 *highPal) { _fadePalette = highPal; _vm->_anim->_noPalChange = true; - readPict(fileName, true); + readPict(fileName.c_str(), true); for (uint16 i = 0; i < 16; i++) { highPal[i] = ((_vm->_anim->_diffPalette[i * 3] >> 2) << 8) + |