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/scumm/imuse | |
| 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/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/imuse/instrument.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 78aba6ced1..4376a94d99 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -188,8 +188,7 @@ int Player::start_seq_sound(int sound, bool reset_vars) { ptr = _se->findStartOfSound(sound); if (ptr == NULL) return -1; - if (_parser) - delete _parser; + delete _parser; if (!memcmp(ptr, "RO", 2)) { // Old style 'RO' resource diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index cadafd412a..bc8380f1b1 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -273,8 +273,7 @@ void Instrument::nativeMT32(bool native) { } void Instrument::clear() { - if (_instrument) - delete _instrument; + delete _instrument; _instrument = NULL; _type = itNone; } |