thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Replace char* by Common::String in several functions

Browse source
This commit is contained in:
Strangerke 2015-12-20 16:02:35 +01:00 • committed by Willem Jan Palenstijn
parent a4d3bda5c1
commit ae9c2fea51
12 changed files with 40 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/lab/dispman.cpp
View file

@ -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) +