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

Fixed some memory leaks

Browse source 
svn-id: r33846
This commit is contained in:
Christopher Page 2008-08-13 20:27:39 +00:00
parent c9e0422722
commit 2d31207a81
6 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/kyra/kyra_lok.cpp
View file

@ -118,8 +118,12 @@ KyraEngine_LoK::~KyraEngine_LoK() {
delete[] _characterList; delete[] _characterList;
delete[] _roomTable;
delete[] _movFacingTable; delete[] _movFacingTable;
delete[] _defaultShapeTable;
delete[] _gui->_scrollUpButton.data0ShapePtr; delete[] _gui->_scrollUpButton.data0ShapePtr;
delete[] _gui->_scrollUpButton.data1ShapePtr; delete[] _gui->_scrollUpButton.data1ShapePtr;
delete[] _gui->_scrollUpButton.data2ShapePtr; delete[] _gui->_scrollUpButton.data2ShapePtr;

1
engines/kyra/staticres.cpp
View file

@ -920,6 +920,7 @@ void StaticResource::freePaletteTable(void *&ptr, int &size) {
uint8 **data = (uint8**)ptr; uint8 **data = (uint8**)ptr;
while (size--) while (size--)
delete[] data[size]; delete[] data[size];
delete[] data;
ptr = 0; ptr = 0;
size = 0; size = 0;
} }

12
engines/sky/control.cpp
View file

@ -238,13 +238,17 @@ void Control::removePanel(void) {
free(_sprites.slide2); free(_sprites.slode); free(_sprites.slide2); free(_sprites.slode);
free(_sprites.slode2); free(_sprites.musicBodge); free(_sprites.slode2); free(_sprites.musicBodge);
delete _controlPanel; delete _exitButton; delete _controlPanel; delete _exitButton;
delete _slide; delete _slide2; delete _slide; delete _slide2;
delete _slode; delete _restorePanButton; delete _slode; delete _restorePanButton;
delete _savePanel; delete _saveButton;
delete _downFastButton; delete _downSlowButton;
delete _upFastButton; delete _upSlowButton;
delete _quitButton; delete _autoSaveButton;
delete _savePanButton; delete _dosPanButton; delete _savePanButton; delete _dosPanButton;
delete _restartPanButton; delete _fxPanButton; delete _restartPanButton; delete _fxPanButton;
delete _musicPanButton; delete _bodge; delete _musicPanButton; delete _bodge;
delete _yesNo; delete _text; delete _yesNo; delete _text;
delete _statusBar; delete _restoreButton; delete _statusBar; delete _restoreButton;
if (_textSprite) { if (_textSprite) {
free(_textSprite); free(_textSprite);

3
engines/sky/intro.cpp
View file

@ -640,9 +640,6 @@ Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *t
} }
Intro::~Intro(void) { Intro::~Intro(void) {
_mixer->stopAll();
_skyScreen->stopSequence();
if (_textBuf) if (_textBuf)
free(_textBuf); free(_textBuf);
if (_saveBuf) if (_saveBuf)

3
engines/sky/sky.cpp
View file

@ -277,6 +277,8 @@ SkyEngine::~SkyEngine() {
delete _skyDisk; delete _skyDisk;
delete _skyControl; delete _skyControl;
delete _skyCompact; delete _skyCompact;
if (_skyIntro)
delete _skyIntro;
for (int i = 0; i < 300; i++) for (int i = 0; i < 300; i++)
if (_itemList[i]) if (_itemList[i])
@ -473,6 +475,7 @@ int SkyEngine::init() {
_systemVars.systemFlags |= SF_PLAY_VOCS; _systemVars.systemFlags |= SF_PLAY_VOCS;
_systemVars.gameSpeed = 50; _systemVars.gameSpeed = 50;
_skyIntro = 0;
_skyCompact = new SkyCompact(); _skyCompact = new SkyCompact();
_skyText = new Text(_skyDisk, _skyCompact); _skyText = new Text(_skyDisk, _skyCompact);
_skyMouse = new Mouse(_system, _skyDisk, _skyCompact); _skyMouse = new Mouse(_system, _skyDisk, _skyCompact);

1
gui/launcher.cpp
View file

@ -669,6 +669,7 @@ void LauncherDialog::selectGame(const String &name) {
LauncherDialog::~LauncherDialog() { LauncherDialog::~LauncherDialog() {
delete _browser; delete _browser;
delete _loadDialog;
} }
void LauncherDialog::open() { void LauncherDialog::open() {