[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.32,1.33 sky.cpp,1.75,1.76 text.cpp,1.37,1.38

[Robert G?ffringmann]

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

Modified Files:
	disk.cpp sky.cpp text.cpp 
Log Message:
make sky detect v.0.0348 (even though not existing ;)

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- disk.cpp	4 Jul 2003 10:19:39 -0000	1.32
+++ disk.cpp	4 Jul 2003 23:26:46 -0000	1.33
@@ -45,8 +45,6 @@
 
 	if (!(_dinnerTableEntries = _dnrHandle->readUint32LE()))
 		error("Error reading from sky.dnr!\n"); //even though it was opened correctly?!
-	
-	debug(1, "Found BASS version v0.0%d (%d dnr entries)", determineGameVersion(), _dinnerTableEntries);
 
 	_dinnerTableArea = (uint8 *)malloc(_dinnerTableEntries * 8);
 	entriesRead = _dnrHandle->read(_dinnerTableArea, 8 * _dinnerTableEntries) / 8;
@@ -58,6 +56,8 @@
 	if (_dataDiskHandle->isOpen() == false) 
 		error("Error opening %s%s!\n", _gameDataPath, dataFilename);
 
+	debug(1, "Found BASS version v0.0%d (%d dnr entries)", determineGameVersion(), _dinnerTableEntries);
+
 	memset(_buildList, 0, 60 * 2);
 	memset(_loadedFilesList, 0, 60 * 4);
 }
@@ -415,7 +415,8 @@
 		return 303;
 	case 1445:
 		//floppy (v0.0331 or v0.0348)
-		return 331;
+		if (_dataDiskHandle->size() == 8830435) return 348;
+		else return 331;
 	case 1711:
 		//cd demo (v0.0365)
 		return 365;

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- sky.cpp	4 Jul 2003 22:39:10 -0000	1.75
+++ sky.cpp	4 Jul 2003 23:26:46 -0000	1.76
@@ -346,18 +346,14 @@
 
 bool SkyState::isDemo(void) {
 	switch (_systemVars.gameVersion) {
-	case 267:
+	case 267: // floppy demo
+	case 365: // cd demo
 		return true;
 	case 288:
-		return false;
 	case 303:
-		return false;
 	case 331:
-		return false;
-	case 365:
-		return true;
+	case 348:
 	case 368:
-		return false;
 	case 372:
 		return false;
 	default:
@@ -369,17 +365,13 @@
 
 	switch (_systemVars.gameVersion) {
 	case 267:
-		return false;
 	case 288:
-		return false;
 	case 303:
-		return false;
 	case 331:
+	case 348:
 		return false;
 	case 365:
-		return true;
 	case 368:
-		return true;
 	case 372:
 		return true;
 	default:

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- text.cpp	27 Jun 2003 12:11:50 -0000	1.37
+++ text.cpp	4 Jul 2003 23:26:46 -0000	1.38
@@ -1741,6 +1741,7 @@
 		_huffTree = huffTree_00303;
 		break;
 	case 331:
+	case 348:
 		_huffTree = huffTree_00331;
 		break;
 	case 365: