[Scummvm-cvs-logs] CVS: scummvm/sword1 resman.cpp,1.12,1.13 resman.h,1.5,1.6

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv15726/sword1

Modified Files:
	resman.cpp resman.h 
Log Message:
removed old, useless stuff

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- resman.cpp	29 Dec 2003 16:08:05 -0000	1.12
+++ resman.cpp	30 Dec 2003 23:08:51 -0000	1.13
@@ -227,13 +227,11 @@
 
 File *ResMan::openClusterFile(uint32 id) {
 	File *clusFile = new File();
-	char fullPath[MAX_PATH_LEN];
 	char fileName[15];
-	makePathToCluster(fullPath);
 	sprintf(fileName, "%s.CLU", _prj.clu[(id >> 24)-1]->label);
 	clusFile->open(fileName);
 	if (!clusFile->isOpen())
-		error("Can't open cluster file %s in directory: %s\n", fileName, fullPath);
+		error("Can't open cluster file %s", fileName);
 	return clusFile;
 }
 
@@ -262,32 +260,6 @@
 	uint8 group = (uint8)(id >> 16);
 
 	return _prj.clu[cluster]->grp[group]->offset[id & 0xFFFF];
-}
-
-void ResMan::makePathToCluster(char *str) {
-	*str = '\0';
-	// todo: add search stuff, cd1, cd2, etc.
-}
-
-void *ResMan::mouseResOpen(uint32 id) {
-	BsMemHandle *memHandle = resHandle(id);
-	if (memHandle->cond == MEM_FREED) {
-		resOpen(id);
-		uint16 *head = (uint16*)memHandle->data;
-#ifdef SCUMM_BIG_ENDIAN
-		for (uint8 endCnt = 0; endCnt < 5; endCnt++)
-			head[endCnt] = READ_LE_UINT16(head + endCnt);
-#endif
-		// fix transparency:
-		uint8 *rawData = (uint8*)memHandle->data;
-		uint32 size = head[0] * head[1] * head[2];
-		rawData += 0x3A;
-		for (uint32 cnt = 0; cnt < size; cnt++)
-			if (rawData[cnt] == 0)
-				rawData[cnt] = 255;
-		return memHandle->data;
-	} else 
-		return openFetchRes(id);
 }
 
 void ResMan::openCptResourceBigEndian(uint32 id) {

Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resman.h	20 Dec 2003 16:30:58 -0000	1.5
+++ resman.h	30 Dec 2003 23:08:51 -0000	1.6
@@ -57,7 +57,6 @@
 	void dumpRes(uint32 id);
 	void *openFetchRes(uint32 id);
 	void *cptResOpen(uint32 id);
-	void *mouseResOpen(uint32 id);
 	Header *lockScript(uint32 scrID);
 	void unlockScript(uint32 scrID);
 	FrameHeader *fetchFrame(void *resourceData, uint32 frameNo);
@@ -70,7 +69,6 @@
 	void openScriptResourceBigEndian(uint32 id);
 
 	File *openClusterFile(uint32 id);
-	void makePathToCluster(char *str);
 	void loadCluDescript(const char *fileName);
 	void freeCluDescript(void);
 	BsPrj _prj;