[Scummvm-cvs-logs] CVS: scummvm/gob game.cpp,1.19,1.20 goblin.cpp,1.14,1.15 init.cpp,1.9,1.10 mult.cpp,1.9,1.10 palanim.cpp,1.6,1.7

[Torbjörn Andersson]

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

Modified Files:
	game.cpp goblin.cpp init.cpp mult.cpp palanim.cpp 
Log Message:
Cleanup


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- game.cpp	30 Apr 2005 11:32:18 -0000	1.19
+++ game.cpp	5 May 2005 11:11:49 -0000	1.20
@@ -1870,26 +1870,21 @@
 			draw_blitInvalidated();
 			free(game_totFileData);
 			game_totFileData = 0;
-			if (game_totTextData != 0 && needTextFree != 0)
-				free(game_totTextData);
 
+			if (needTextFree)
+				free(game_totTextData);
 			game_totTextData = 0;
 
-			if (game_totResourceTable != 0
-			    && needFreeResTable != 0)
+			if (needFreeResTable)
 				free(game_totResourceTable);
-
 			game_totResourceTable = 0;
 
-			if (game_imFileData != 0)
-				free(game_imFileData);
-
+			free(game_imFileData);
 			game_imFileData = 0;
 
-			if (game_extTable != 0)
-				free(game_extTable);
-
+			free(game_extTable);
 			game_extTable = 0;
+
 			if (game_extHandle >= 0)
 				data_closeData(game_extHandle);
 

Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- goblin.cpp	1 May 2005 10:15:30 -0000	1.14
+++ goblin.cpp	5 May 2005 11:11:49 -0000	1.15
@@ -1842,23 +1842,14 @@
 
 		for (state = 0; state < 40; state++) {
 			for (col = 0; col < 6; col++) {
-
-				if (gob_goblins[i]->stateMach[state][col] != 0) {
-					free(gob_goblins[i]->
-					    stateMach[state][col]);
-					gob_goblins[i]->stateMach[state][col] =
-					    0;
-				}
+				free(gob_goblins[i]->stateMach[state][col]);
+				gob_goblins[i]->stateMach[state][col] = 0;
 			}
 		}
 
 		if (i == 3) {
 			for (state = 40; state < 70; state++) {
-				if (gob_goblins[3]->stateMach[state][0] == 0)
-					continue;
-
-				free(gob_goblins[3]->
-				    stateMach[state][0]);
+				free(gob_goblins[3]->stateMach[state][0]);
 				gob_goblins[3]->stateMach[state][0] = 0;
 			}
 		}
@@ -1876,11 +1867,7 @@
 
 		for (state = 0; state < 40; state++) {
 			for (col = 0; col < 6; col++) {
-				if (gob_objects[i]->stateMach[state][col] == 0)
-					continue;
-
-				free(gob_objects[i]->
-				    stateMach[state][col]);
+				free(gob_objects[i]->stateMach[state][col]);
 				gob_objects[i]->stateMach[state][col] = 0;
 			}
 		}

Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/init.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- init.cpp	29 Apr 2005 15:01:03 -0000	1.9
+++ init.cpp	5 May 2005 11:11:49 -0000	1.10
@@ -282,17 +282,10 @@
 		cd_stopPlaying();
 		cd_freeLICbuffer();
 
-		if (inter_variables != 0)
-			free(inter_variables);
-
-		if (game_totFileData != 0)
-			free(game_totFileData);
-
-		if (game_totTextData != 0)
-			free(game_totTextData);
-
-		if (game_totResourceTable != 0)
-			free(game_totResourceTable);
+		free(inter_variables);
+		free(game_totFileData);
+		free(game_totTextData);
+		free(game_totResourceTable);
 	}
 
 	for (i = 0; i < 4; i++) {

Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mult.cpp	4 May 2005 07:32:11 -0000	1.9
+++ mult.cpp	5 May 2005 11:11:49 -0000	1.10
@@ -475,11 +475,8 @@
 	if (anim_underAnimSurf != 0)
 		vid_freeSurfDesc(anim_underAnimSurf);
 
-	if (mult_objects != 0)
-		free(mult_objects);
-
-	if (mult_renderData != 0)
-		free(mult_renderData);
+	free(mult_objects);
+	free(mult_renderData);
 
 	mult_objects = 0;
 	mult_renderData = 0;
@@ -931,24 +928,19 @@
 
 	if (stopNoClear == 0) {
 		if (mult_animDataAllocated) {
-			if (mult_objects)
-				free(mult_objects);
+			free(mult_objects);
 			mult_objects = 0;
 
-			if (mult_renderData)
-				free(mult_renderData);
+			free(mult_renderData);
 			mult_renderData = 0;
 
-			if (mult_animArrayX)
-				free(mult_animArrayX);
+			free(mult_animArrayX);
 			mult_animArrayX = 0;
 
-			if (mult_animArrayY)
-				free(mult_animArrayY);
+			free(mult_animArrayY);
 			mult_animArrayY = 0;
 
-			if (mult_animArrayData)
-				free(mult_animArrayData);
+			free(mult_animArrayData);
 			mult_animArrayData = 0;
 
 			if (anim_underAnimSurf)
@@ -1178,24 +1170,19 @@
 	mult_multData = 0;
 
 	if (mult_animDataAllocated != 0) {
-		if (mult_objects)
-			free(mult_objects);
+		free(mult_objects);
 		mult_objects = 0;
 
-		if (mult_renderData)
-			free(mult_renderData);
+		free(mult_renderData);
 		mult_renderData = 0;
 
-		if (mult_animArrayX)
-			free(mult_animArrayX);
+		free(mult_animArrayX);
 		mult_animArrayX = 0;
 
-		if (mult_animArrayY)
-			free(mult_animArrayY);
+		free(mult_animArrayY);
 		mult_animArrayY = 0;
 
-		if (mult_animArrayData)
-			free(mult_animArrayData);
+		free(mult_animArrayData);
 		mult_animArrayData = 0;
 
 		if (anim_underAnimSurf)

Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/palanim.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- palanim.cpp	9 Apr 2005 19:32:28 -0000	1.6
+++ palanim.cpp	5 May 2005 11:11:49 -0000	1.7
@@ -228,10 +228,8 @@
 			util_clearPalette();
 	}
 
-	if (tmpPalBuffer != 0) {
-		free(tmpPalBuffer);
-		tmpPalBuffer = 0;
-	}
+	free(tmpPalBuffer);
+	tmpPalBuffer = 0;
 }
 
 }				// End of namespace Gob