From 72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 3 Jan 2010 19:37:43 +0000
Subject: Fixed a bunch of cppcheck warnings. Mostly about checking if a
 pointer is null before freeing it, which isn't necessary.

svn-id: r46941
---
 engines/scumm/imuse/imuse_player.cpp | 3 +--
 engines/scumm/imuse/instrument.cpp   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/scumm/imuse')

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;
 }
-- 
cgit v1.2.3