[Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.2,1.3 game.cpp,1.4,1.5 goblin.cpp,1.2,1.3 init.cpp,1.1,1.2 mult.cpp,1.3,1.4 palanim.cpp,1.1,1.2 scenery.cpp,1.2,1.3 util.cpp,1.4,1.5 video.cpp,1.1,1.2

Max Horn fingolfin at users.sourceforge.net
Tue Apr 5 10:51:10 CEST 2005


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

Modified Files:
	dataio.cpp game.cpp goblin.cpp init.cpp mult.cpp palanim.cpp 
	scenery.cpp util.cpp video.cpp 
Log Message:
Remove useless casts

Index: dataio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/dataio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dataio.cpp	5 Apr 2005 15:53:16 -0000	1.2
+++ dataio.cpp	5 Apr 2005 17:50:30 -0000	1.3
@@ -232,7 +232,7 @@
 	int16 file;
 	for (file = MAX_DATA_FILES - 1; file >= 0; file--) {
 		if (dataFiles[file] != 0) {
-			free((char *)dataFiles[file]);
+			free(dataFiles[file]);
 			dataFiles[file] = 0;
 			file_getHandle(dataFileHandles[file])->close();
 			return;
@@ -269,13 +269,13 @@
 	sizeLeft = packedSize;
 	ptr = packBuf;
 	while (sizeLeft > 0x4000) {
-		data_readChunk(chunk, (char *)ptr, 0x4000);
+		data_readChunk(chunk, ptr, 0x4000);
 		sizeLeft -= 0x4000;
 		ptr += 0x4000;
 	}
-	data_readChunk(chunk, (char *)ptr, sizeLeft);
+	data_readChunk(chunk, ptr, sizeLeft);
 	data_freeChunk(chunk);
-	unpackData((char *)packBuf, (char *)unpackBuf);
+	unpackData(packBuf, unpackBuf);
 	free(packBuf);
 	return unpackBuf;
 }
@@ -353,11 +353,11 @@
 
 	ptr = data;
 	while (size > 0x4000) {
-		data_readData(handle, (char *)ptr, 0x4000);
+		data_readData(handle, ptr, 0x4000);
 		size -= 0x4000;
 		ptr += 0x4000;
 	}
-	data_readData(handle, (char *)ptr, size);
+	data_readData(handle, ptr, size);
 	data_closeData(handle);
 	return data;
 

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- game.cpp	5 Apr 2005 17:41:37 -0000	1.4
+++ game.cpp	5 Apr 2005 17:50:32 -0000	1.5
@@ -254,7 +254,7 @@
 	    game_collStackElemSizes[game_collStackSize] *
 	    sizeof(Game_Collision));
 
-	free((char *)game_collStack[game_collStackSize]);
+	free(game_collStack[game_collStackSize]);
 }
 
 int16 game_checkMousePoint(int16 all, int16 *resId, int16 *resIndex) {
@@ -378,7 +378,7 @@
 	itemPtr = &game_totResourceTable->items[id];
 	offset = itemPtr->offset;
 	if (offset >= 0) {
-		return (char *)((char *)game_totResourceTable) + szGame_TotResTable +
+		return ((char *)game_totResourceTable) + szGame_TotResTable +
 		    szGame_TotResItem * game_totResourceTable->itemsCount + offset;
 	} else {
 		return (char *)(game_imFileData +
@@ -438,7 +438,7 @@
 		game_soundFromExt[slot] = 0;
 	}
 
-	free((char *)game_soundSamples[slot]);
+	free(game_soundSamples[slot]);
 	game_soundSamples[slot] = 0;
 }
 
@@ -1852,13 +1852,13 @@
 			free(game_totFileData);
 			game_totFileData = 0;
 			if (game_totTextData != 0 && needTextFree != 0)
-				free((char *)game_totTextData);
+				free(game_totTextData);
 
 			game_totTextData = 0;
 
 			if (game_totResourceTable != 0
 			    && needFreeResTable != 0)
-				free((char *)game_totResourceTable);
+				free(game_totResourceTable);
 
 			game_totResourceTable = 0;
 
@@ -1868,7 +1868,7 @@
 			game_imFileData = 0;
 
 			if (game_extTable != 0)
-				free((char *)game_extTable);
+				free(game_extTable);
 
 			game_extTable = 0;
 			if (game_extHandle >= 0)
@@ -1912,7 +1912,7 @@
 	game_prepareStart();
 	game_playTot(0);
 
-	free((char *)game_collisionAreas);
+	free(game_collisionAreas);
 
 	vid_freeSurfDesc(draw_cursorSprites);
 	vid_freeSurfDesc(draw_cursorBack);

Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- goblin.cpp	5 Apr 2005 17:41:37 -0000	1.2
+++ goblin.cpp	5 Apr 2005 17:50:32 -0000	1.3
@@ -1845,7 +1845,7 @@
 			for (col = 0; col < 6; col++) {
 
 				if (gob_goblins[i]->stateMach[state][col] != 0) {
-					free((char *)gob_goblins[i]->
+					free(gob_goblins[i]->
 					    stateMach[state][col]);
 					gob_goblins[i]->stateMach[state][col] =
 					    0;
@@ -1858,14 +1858,14 @@
 				if (gob_goblins[3]->stateMach[state][0] == 0)
 					continue;
 
-				free((char *)gob_goblins[3]->
+				free(gob_goblins[3]->
 				    stateMach[state][0]);
 				gob_goblins[3]->stateMach[state][0] = 0;
 			}
 		}
 
-		free((char *)gob_goblins[i]->stateMach);
-		free((char *)gob_goblins[i]);
+		free(gob_goblins[i]->stateMach);
+		free(gob_goblins[i]);
 		gob_goblins[i] = 0;
 	}
 
@@ -1880,14 +1880,14 @@
 				if (gob_objects[i]->stateMach[state][col] == 0)
 					continue;
 
-				free((char *)gob_objects[i]->
+				free(gob_objects[i]->
 				    stateMach[state][col]);
 				gob_objects[i]->stateMach[state][col] = 0;
 			}
 		}
 
-		free((char *)gob_objects[i]->stateMach);
-		free((char *)gob_objects[i]);
+		free(gob_objects[i]->stateMach);
+		free(gob_objects[i]);
 		gob_objects[i] = 0;
 	}
 }

Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/init.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.cpp	5 Apr 2005 15:07:39 -0000	1.1
+++ init.cpp	5 Apr 2005 17:50:33 -0000	1.2
@@ -273,10 +273,10 @@
 			free(game_totFileData);
 
 		if (game_totTextData != 0)
-			free((char *)game_totTextData);
+			free(game_totTextData);
 
 		if (game_totResourceTable != 0)
-			free((char *)game_totResourceTable);
+			free(game_totResourceTable);
 	}
 
 	for (i = 0; i < 4; i++) {
@@ -284,7 +284,7 @@
 			util_freeFont(draw_fonts[i]);
 	}
 
-	free((char *)init_palDesc);
+	free(init_palDesc);
 	data_closeDataFile();
 	vid_initPrimary(-1);
 	init_cleanup();

Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mult.cpp	5 Apr 2005 17:41:37 -0000	1.3
+++ mult.cpp	5 Apr 2005 17:50:33 -0000	1.4
@@ -463,10 +463,10 @@
 		vid_freeSurfDesc(anim_underAnimSurf);
 
 	if (mult_objects != 0)
-		free((char *)mult_objects);
+		free(mult_objects);
 
 	if (mult_renderData != 0)
-		free((char *)mult_renderData);
+		free(mult_renderData);
 
 	mult_objects = 0;
 	mult_renderData = 0;
@@ -922,23 +922,23 @@
 	if (stopNoClear == 0) {
 		if (mult_animDataAllocated) {
 			if (mult_objects)
-				free((char *)mult_objects);
+				free(mult_objects);
 			mult_objects = 0;
 
 			if (mult_renderData)
-				free((char *)mult_renderData);
+				free(mult_renderData);
 			mult_renderData = 0;
 
 			if (mult_animArrayX)
-				free((char *)mult_animArrayX);
+				free(mult_animArrayX);
 			mult_animArrayX = 0;
 
 			if (mult_animArrayY)
-				free((char *)mult_animArrayY);
+				free(mult_animArrayY);
 			mult_animArrayY = 0;
 
 			if (mult_animArrayData)
-				free((char *)mult_animArrayData);
+				free(mult_animArrayData);
 			mult_animArrayData = 0;
 
 			if (anim_underAnimSurf)
@@ -1150,42 +1150,42 @@
 			scen_freeAnim(mult_animIndices[i]);
 	}
 
-	free((char *)mult_staticKeys);
+	free(mult_staticKeys);
 
 	for (i = 0; i < 4; i++)
-		free((char *)mult_animKeys[i]);
+		free(mult_animKeys[i]);
 
-	free((char *)mult_palFadeKeys);
-	free((char *)mult_palKeys);
-	free((char *)mult_textKeys);
+	free(mult_palFadeKeys);
+	free(mult_palKeys);
+	free(mult_textKeys);
 
 	for (i = 0; i < mult_sndSlotsCount; i++) {
 		game_freeSoundSlot(19 - i);
 	}
 
-	free((char *)mult_sndKeys);
+	free(mult_sndKeys);
 
 	mult_multData = 0;
 
 	if (mult_animDataAllocated != 0) {
 		if (mult_objects)
-			free((char *)mult_objects);
+			free(mult_objects);
 		mult_objects = 0;
 
 		if (mult_renderData)
-			free((char *)mult_renderData);
+			free(mult_renderData);
 		mult_renderData = 0;
 
 		if (mult_animArrayX)
-			free((char *)mult_animArrayX);
+			free(mult_animArrayX);
 		mult_animArrayX = 0;
 
 		if (mult_animArrayY)
-			free((char *)mult_animArrayY);
+			free(mult_animArrayY);
 		mult_animArrayY = 0;
 
 		if (mult_animArrayData)
-			free((char *)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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- palanim.cpp	5 Apr 2005 15:07:39 -0000	1.1
+++ palanim.cpp	5 Apr 2005 17:50:33 -0000	1.2
@@ -216,7 +216,7 @@
 	}
 
 	if (tmpPalBuffer != 0) {
-		free((char *)tmpPalBuffer);
+		free(tmpPalBuffer);
 		tmpPalBuffer = 0;
 	}
 }

Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scenery.cpp	5 Apr 2005 16:33:38 -0000	1.2
+++ scenery.cpp	5 Apr 2005 17:50:33 -0000	1.3
@@ -168,7 +168,7 @@
 
 	for (i = 0; i < scen_staticPictCount[index]; i++) {
 		if (scen_staticFromExt[index] == 1)
-			free((char *)scen_statics[index].pieces[i]);
+			free(scen_statics[index].pieces[i]);
 
 		spr = scen_staticPictToSprite[index * 7 + i];
 		scen_spriteRefs[spr]--;
@@ -179,10 +179,10 @@
 		}
 	}
 
-	free((char *)scen_statics[index].layers);
-	free((char *)scen_statics[index].pieces);
+	free(scen_statics[index].layers);
+	free(scen_statics[index].pieces);
 	if (scen_staticFromExt[index] == 1)
-		free((char *)scen_statics[index].dataPtr);
+		free(scen_statics[index].dataPtr);
 
 	scen_staticFromExt[index] = 0;
 	scen_staticPictCount[index] = -1;
@@ -672,7 +672,7 @@
 
 	for (i = 0; i < scen_animPictCount[animation]; i++) {
 		if (scen_animFromExt[animation] == 1)
-			free((char *)scen_animations[animation].pieces[i]);
+			free(scen_animations[animation].pieces[i]);
 
 		spr = scen_animPictToSprite[animation * 7 + i];
 		scen_spriteRefs[spr]--;
@@ -684,8 +684,8 @@
 		}
 	}
 
-	free((char *)scen_animations[animation].layers);
-	free((char *)scen_animations[animation].pieces);
+	free(scen_animations[animation].layers);
+	free(scen_animations[animation].pieces);
 	if (scen_animFromExt[animation] == 1)
 		free(scen_animations[animation].dataPtr);
 

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/util.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- util.cpp	5 Apr 2005 17:41:37 -0000	1.4
+++ util.cpp	5 Apr 2005 17:50:33 -0000	1.5
@@ -238,7 +238,7 @@
 
 	data = data_getData(path);
 	if (data == 0) {
-		free((char *)fontDesc);
+		free(fontDesc);
 		return 0;
 	}
 
@@ -263,7 +263,7 @@
 
 void util_freeFont(FontDesc * fontDesc) {
 	free(fontDesc->dataPtr - 4);
-	free((char *)fontDesc);
+	free(fontDesc);
 }
 
 void util_clearPalette(void) {
@@ -388,12 +388,12 @@
 
 void util_listDropFront(Util_List * list) {
 	if (list->pHead->pNext == 0) {
-		free((char *)(list->pHead));
+		free((list->pHead));
 		list->pHead = 0;
 		list->pTail = 0;
 	} else {
 		list->pHead = list->pHead->pNext;
-		free((char *)(list->pHead->pPrev));
+		free((list->pHead->pPrev));
 		list->pHead->pPrev = 0;
 	}
 }
@@ -403,7 +403,7 @@
 		util_listDropFront(list);
 	}
 
-	free((char *)list);
+	free(list);
 }
 
 char util_str1[] =

Index: video.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- video.cpp	5 Apr 2005 15:07:40 -0000	1.1
+++ video.cpp	5 Apr 2005 17:50:33 -0000	1.2
@@ -140,7 +140,7 @@
 void vid_freeSurfDesc(SurfaceDesc * surfDesc) {
 	sprAllocated--;
 	if (surfDesc != pPrimarySurfDesc)
-		free((char *)surfDesc);
+		free(surfDesc);
 	else 
 		free(surfDesc->vidPtr);
 }





More information about the Scummvm-git-logs mailing list