[Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.10,1.11 map.cpp,1.14,1.15

[Torbjörn Andersson]

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

Modified Files:
	dataio.cpp map.cpp 
Log Message:
Cleanup.


Index: dataio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/dataio.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dataio.cpp	18 Oct 2005 01:30:17 -0000	1.10
+++ dataio.cpp	22 Nov 2005 13:17:08 -0000	1.11
@@ -26,32 +26,28 @@
 
 namespace Gob {
 
-int16 file_write(int16 handle, char *buf, int16 size) {
-	return filesHandles[handle].write(buf, size);
+Common::File *file_getHandle(int16 handle) {
+	return &filesHandles[handle];
 }
 
 int16 file_open(const char *path, Common::File::AccessMode mode) {
 	int16 i;
 
 	for (i = 0; i < MAX_FILES; i++) {
-		if (!filesHandles[i].isOpen())
+		if (!file_getHandle(i)->isOpen())
 			break;
 	}
 	if (i == MAX_FILES)
 		return -1;
 
-	filesHandles[i].open(path, mode);
+	file_getHandle(i)->open(path, mode);
 
-	if (filesHandles[i].isOpen())
+	if (file_getHandle(i)->isOpen())
 		return i;
 
 	return -1;
 }
 
-Common::File *file_getHandle(int16 handle) {
-	return &filesHandles[handle];
-}
-
 int16 data_getChunk(const char *chunkName) {
 	int16 file;
 	int16 slot;
@@ -364,8 +360,4 @@
 	return data;
 }
 
-char *data_getSmallData(const char *path) {
-	return data_getData(path);
-}
-
 }				// End of namespace Gob

Index: map.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- map.cpp	18 Oct 2005 01:30:17 -0000	1.14
+++ map.cpp	22 Nov 2005 13:17:08 -0000	1.15
@@ -453,7 +453,7 @@
 	if (handle >= 0) {
 		map_loadFromAvo = 1;
 		data_closeData(handle);
-		map_avoDataPtr = data_getSmallData(avoName);
+		map_avoDataPtr = data_getData(avoName);
 		dataBuf = map_avoDataPtr;
 		map_loadDataFromAvo((char *)map_passMap, 28 * 26);
 
@@ -471,7 +471,7 @@
 		map_loadDataFromAvo((char *)map_itemPoses, szMap_ItemPos * 20);
 	} else {
 		map_loadFromAvo = 0;
-		map_avoDataPtr = data_getSmallData(avjFile);
+		map_avoDataPtr = data_getData(avjFile);
 		dataBuf = map_avoDataPtr;
 	}