diff options
author | Filippos Karapetis | 2015-12-19 02:12:42 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:35:27 +0100 |
commit | 3e8eaa2c3552df625c2654b7d76e9b1f35bc9e92 (patch) | |
tree | fb3fee9adb744cae914dd1b7df253c8f3ba59f90 /engines/lab/dispman.cpp | |
parent | eb70efc900cd224c4ca301ddf49785ab21ab6132 (diff) | |
download | scummvm-rg350-3e8eaa2c3552df625c2654b7d76e9b1f35bc9e92.tar.gz scummvm-rg350-3e8eaa2c3552df625c2654b7d76e9b1f35bc9e92.tar.bz2 scummvm-rg350-3e8eaa2c3552df625c2654b7d76e9b1f35bc9e92.zip |
LAB: Use Common::String for strings, removing a ton of memory leaks
Also, add a method to properly free room views
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 8d26cef4ab..c928649c3a 100644 --- a/engines/lab/dispman.cpp +++ b/engines/lab/dispman.cpp @@ -66,7 +66,7 @@ DisplayMan::DisplayMan(LabEngine *vm) : _vm(vm) { DisplayMan::~DisplayMan() { freePict(); delete _dispBitMap; - delete[]_displayBuffer; + delete[] _displayBuffer; } // From readPict.c. Reads in pictures and animations from disk. @@ -92,10 +92,10 @@ void DisplayMan::loadBackPict(const char *fileName, uint16 *highPal) { /** * Reads in a picture into the display bitmap. */ -void DisplayMan::readPict(const char *filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer, uint16 maxHeight) { +void DisplayMan::readPict(Common::String filename, bool playOnce, bool onlyDiffData, byte *memoryBuffer, uint16 maxHeight) { _vm->_anim->stopDiff(); - loadPict(filename); + loadPict(filename.c_str()); _vm->_music->updateMusic(); |