[Scummvm-cvs-logs] CVS: scummvm/bs2 resman.cpp,1.22,1.23 resman.h,1.2,1.3

[Max Horn]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv15325

Modified Files:
	resman.cpp resman.h 
Log Message:
No need to have convertEndian member of class resMan

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- resman.cpp	12 Sep 2003 20:26:54 -0000	1.22
+++ resman.cpp	12 Sep 2003 20:46:12 -0000	1.23
@@ -255,6 +255,8 @@
 	free(count);
 }
 
+static void convertEndian(uint8 *file, uint32 len);
+
 uint8 *resMan::Res_open(uint32 res) {	//BHTony30May96
 	// returns ad of resource. Loads if not in memory
 	// retains a count
@@ -370,7 +372,7 @@
 		file.close();
 
 #ifdef SCUMM_BIG_ENDIAN
-		convertEndian((uint8 *) resList[res]->ad);
+		convertEndian((uint8 *)resList[res]->ad, len);
 #endif
 	} else {
 		// Zdebug("RO %d, already open count=%d", res, count[res]);
@@ -390,7 +392,7 @@
 	return (uint8 *) resList[res]->ad;
 }
 
-void resMan::convertEndian(uint8 *file) {
+static void convertEndian(uint8 *file, uint32 len) {
 	_standardHeader *hdr = (_standardHeader *)file;
 
 	hdr->compSize = SWAP_BYTES_32(hdr->compSize);

Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resman.h	12 Sep 2003 18:52:52 -0000	1.2
+++ resman.h	12 Sep 2003 20:46:12 -0000	1.3
@@ -44,8 +44,6 @@
 		void	Res_close(uint32 res);			//decrements the count
 
 //----
-		void convertEndian(uint8 *ad);
-
 		uint8	Res_check_valid( uint32 res );	// returns '0' if resource out of range or null, otherwise '1' for ok
 
 												//resource floats when count=0