diff options
| author | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
| commit | 72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 (patch) | |
| tree | 032c9107838aefca6a166465a46fa7318bb82566 /engines/sky/music/musicbase.cpp | |
| parent | 910ffb53a0b6c74a965df9a1270cdfc3885252ec (diff) | |
| download | scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.gz scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.bz2 scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.zip | |
Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.
svn-id: r46941
Diffstat (limited to 'engines/sky/music/musicbase.cpp')
| -rw-r--r-- | engines/sky/music/musicbase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index a4eeaa017d..0d3cb65e1b 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -40,16 +40,14 @@ MusicBase::MusicBase(Disk *pDisk) { MusicBase::~MusicBase() { stopMusic(); - if (_musicData) - free(_musicData); + free(_musicData); } void MusicBase::loadSection(uint8 pSection) { _mutex.lock(); if (_currentMusic) stopMusicInternal(); - if (_musicData) - free(_musicData); + free(_musicData); _currentSection = pSection; _musicData = _skyDisk->loadFile(_driverFileBase + FILES_PER_SECTION * pSection); |