[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.28,1.29 disk.cpp,1.37,1.38

Robert G?ffringmann lavosspawn at users.sourceforge.net
Tue Jul 8 15:09:12 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv30302/sky

Modified Files:
	control.cpp disk.cpp 
Log Message:
fixed file loading bugs for v.0.0331, control panel works now

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- control.cpp	7 Jul 2003 17:00:55 -0000	1.28
+++ control.cpp	8 Jul 2003 22:08:29 -0000	1.29
@@ -438,7 +438,7 @@
 	initPanel();
 
 	_skyScreen->clearScreen();
-	if ((!SkyState::isCDVersion()) && (SkyState::_systemVars.gameVersion != 348)) 
+	if (SkyState::_systemVars.gameVersion < 331)
 		_skyScreen->setPalette(60509);
 	else
 		_skyScreen->setPalette(60510);

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- disk.cpp	7 Jul 2003 14:58:53 -0000	1.37
+++ disk.cpp	8 Jul 2003 22:08:29 -0000	1.38
@@ -127,11 +127,15 @@
 	
 	_fileOffset = READ_LE_UINT32((filePtr + 2)) & 0x0ffffff;
 
-	cflag = (uint8)((_fileOffset >> (23)) & 0x1);
-	_fileOffset = (((1 << (23)) ^ 0xFFFFFFFF) & _fileOffset);
+	cflag = (uint8)((_fileOffset >> 23) & 0x1);
+	_fileOffset &= 0x7FFFFF;
 
-	if (cflag)
-		_fileOffset <<= 4;
+	if (cflag) {
+		if (SkyState::_systemVars.gameVersion == 331)
+			_fileOffset <<= 3;
+		else
+			_fileOffset <<= 4;
+	}
 
 	_fixedDest = dest;
 	_fileDest = dest;





More information about the Scummvm-git-logs mailing list