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

LAB: Use Common::String for strings, removing a ton of memory leaks

Browse source 
Also, add a method to properly free room views
This commit is contained in:
Filippos Karapetis 2015-12-19 02:12:42 +02:00 • committed by Willem Jan Palenstijn
parent eb70efc900
commit 3e8eaa2c35
11 changed files with 138 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/lab/map.cpp
View file

@ -404,8 +404,8 @@ void LabEngine::drawMap(uint16 curRoom, uint16 curMsg, uint16 floorNum, bool fad
_graphics->flowText(_msgFont, 0, 5, 3, true, true, true, true, _utils->vgaRectScale(14, 75, 134, 97), textPrt);
}
if (_rooms[curMsg]._roomMsg)
_graphics->flowText(_msgFont, 0, 5, 3, true, true, true, true, _utils->vgaRectScale(14, 148, 134, 186), _rooms[curMsg]._roomMsg);
if (_rooms[curMsg]._roomMsg != "")
_graphics->flowText(_msgFont, 0, 5, 3, true, true, true, true, _utils->vgaRectScale(14, 148, 134, 186), _rooms[curMsg]._roomMsg.c_str());
if (fadeIn)
_graphics->fade(true, 0);
@ -535,11 +535,11 @@ void LabEngine::processMap(uint16 curRoom) {
}
if (oldMsg != curMsg) {
if (_rooms[curMsg]._roomMsg == nullptr)
if (_rooms[curMsg]._roomMsg != "")
_resource->readViews(curMsg);
char *sptr;
if ((sptr = _rooms[curMsg]._roomMsg)) {
const char *sptr;
if ((sptr = _rooms[curMsg]._roomMsg.c_str())) {
_event->mouseHide();
_graphics->setPen(3);
_graphics->rectFillScaled(13, 148, 135, 186);