[Scummvm-cvs-logs] CVS: scummvm/sword1 resman.cpp,1.10,1.11

[Robert G?ffringmann]

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

Modified Files:
	resman.cpp 
Log Message:
fix resource references for soldout version

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resman.cpp	29 Dec 2003 15:38:16 -0000	1.10
+++ resman.cpp	29 Dec 2003 15:54:06 -0000	1.11
@@ -238,28 +238,28 @@
 }
 
 BsMemHandle *ResMan::resHandle(uint32 id) {
-	uint8 cluster = (uint8)((id >> 24) - 1);
-	uint8 group = (uint8)(id >> 16);
 	if ((id >> 16) == 0x0405)
 		id = _srIdList[id & 0xFFFF];
+	uint8 cluster = (uint8)((id >> 24) - 1);
+	uint8 group = (uint8)(id >> 16);
 
 	return &(_prj.clu[cluster]->grp[group]->resHandle[id & 0xFFFF]);
 }
 
 uint32 ResMan::resLength(uint32 id) {
-	uint8 cluster = (uint8)((id >> 24) - 1);
-	uint8 group = (uint8)(id >> 16);
 	if ((id >> 16) == 0x0405)
 		id = _srIdList[id & 0xFFFF];
+	uint8 cluster = (uint8)((id >> 24) - 1);
+	uint8 group = (uint8)(id >> 16);
 
 	return _prj.clu[cluster]->grp[group]->length[id & 0xFFFF];
 }
 
 uint32 ResMan::resOffset(uint32 id) {
-	uint8 cluster = (uint8)((id >> 24) - 1);
-	uint8 group = (uint8)(id >> 16);
 	if ((id >> 16) == 0x0405)
 		id = _srIdList[id & 0xFFFF];
+	uint8 cluster = (uint8)((id >> 24) - 1);
+	uint8 group = (uint8)(id >> 16);
 
 	return _prj.clu[cluster]->grp[group]->offset[id & 0xFFFF];
 }