[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.105,1.106

Max Horn fingolfin at users.sourceforge.net
Sun Apr 24 11:26:35 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23564/saga

Modified Files:
	saga.cpp 
Log Message:
You can safely delete/free null pointers

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- saga.cpp	22 Apr 2005 14:11:02 -0000	1.105
+++ saga.cpp	24 Apr 2005 18:26:12 -0000	1.106
@@ -167,54 +167,22 @@
 SagaEngine::~SagaEngine() {
 	int i;
 
-	if (_sndRes != NULL) {
-		delete _sndRes;
-	}
-	if (_events != NULL) {
-		delete _events;
-	}
-	if (_font != NULL) {
-		delete _font;
-	}
-	if (_sprite != NULL) {
-		delete _sprite;
-	}
-	if (_anim != NULL) {
-		delete _anim;
-	}
-	if (_script != NULL) {
-		delete _script;
-	}
-	if (_interface != NULL) {
-		delete _interface;
-	}
-	if (_actor != NULL) {
-		delete _actor;
-	}
-	if (_palanim != NULL) {
-		delete _palanim;
-	}
-	if (_scene != NULL) {
-		delete _scene;
-	}
-	if (_isoMap != NULL) {
-		delete _isoMap;
-	}
-	if (_render != NULL) {
-		delete _render;
-	}
-	if (_music != NULL) {
-		delete _music;
-	}
-	if (_sound != NULL) {
-		delete _sound;
-	}
-	if (_gfx != NULL) {
-		delete _gfx;
-	}
-	if (_console != NULL) {
-		delete _console;
-	}
+	delete _sndRes;
+	delete _events;
+	delete _font;
+	delete _sprite;
+	delete _anim;
+	delete _script;
+	delete _interface;
+	delete _actor;
+	delete _palanim;
+	delete _scene;
+	delete _isoMap;
+	delete _render;
+	delete _music;
+	delete _sound;
+	delete _gfx;
+	delete _console;
 
 	if (_gameFileContexts != NULL) {
 		for (i = 0; i < _gameDescription->filesCount; i++) {





More information about the Scummvm-git-logs mailing list