Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null

before freeing it, which isn't necessary.

svn-id: r46941

1 files changed, 5 insertions, 14 deletions

diff --git a/engines/m4/scene.cpp b/engines/m4/scene.cpp
index 905cb744c3..f61a2e88ce 100644
--- a/engines/m4/scene.cpp
+++ b/engines/m4/scene.cpp
@@ -73,21 +73,13 @@ Scene::~Scene() {
 
 	delete _backgroundSurface;
 	delete _codeSurface;
-
-	if (_sceneSprites)
-		delete _sceneSprites;
+	delete _sceneSprites;
 
 //	_vm->_palette->deleteAllRanges();
 
-	if (_palData)
-		delete _palData;
-
-	if (_interfacePal)
-		delete _interfacePal;
-
-	if (_inverseColorTable)
-		delete[] _inverseColorTable;
-
+	delete _palData;
+	delete _interfacePal;
+	delete[] _inverseColorTable;
 }
 
 void Scene::loadScene(int sceneNumber) {
@@ -284,8 +276,7 @@ void Scene::loadSceneInverseColorTable(int sceneNumber) {
 	if (_vm->isM4()) {
 		sprintf(filename, "%i.ipl", sceneNumber);
 		iplS = _vm->res()->openFile(filename);
-		if (_inverseColorTable)
-			delete[] _inverseColorTable;
+		delete[] _inverseColorTable;
 		_inverseColorTable = new byte[iplS->size()];
 		iplS->read(_inverseColorTable, iplS->size());
 		_vm->res()->toss(filename);