[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.171,1.172

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21307

Modified Files:
	smush_player.cpp 
Log Message:
No need to test if a pointer is NULL before freeing it. And since I
couldn't see _frameBuffer being freed anywhere, I added that as well,
though I'm not sure when it's allocated.


Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- smush_player.cpp	26 Jun 2005 23:37:59 -0000	1.171
+++ smush_player.cpp	19 Jul 2005 17:04:16 -0000	1.172
@@ -300,31 +300,27 @@
 	_vm->_smushVideoShouldFinish = true;
 
 	for (int i = 0; i < 5; i++) {
-		if (_sf[i]) {
-			delete _sf[i];
-			_sf[i] = NULL;
-		}
+		delete _sf[i];
+		_sf[i] = NULL;
 	}
 
-	if (_strings) {
-		delete _strings;
-		_strings = NULL;
-	}
+	delete _strings;
+	_strings = NULL;
 
-	if (_smixer) {
+	if (_smixer)
 		_smixer->stop();
-		delete _smixer;
-		_smixer = NULL;
-	}
 
-	if (_base) {
-		delete _base;
-		_base = NULL;
-	}
-	if (_specialBuffer) {
-		free(_specialBuffer);
-		_specialBuffer = NULL;
-	}
+	delete _smixer;
+	_smixer = NULL;
+
+	delete _base;
+	_base = NULL;
+
+	free(_specialBuffer);
+	_specialBuffer = NULL;
+
+	free(_frameBuffer);
+	_frameBuffer = NULL;
 
 	_vm->_mixer->stopHandle(_compressedFileSoundHandle);