[Scummvm-cvs-logs] SF.net SVN: scummvm: [30095] scummvm/trunk/engines/lure/disk.cpp

[dreammaster at users.sourceforge.net]

Revision: 30095
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30095&view=rev
Author:   dreammaster
Date:     2007-12-30 21:56:22 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
Added code to support reading .ega files

Modified Paths:
--------------
    scummvm/trunk/engines/lure/disk.cpp

Modified: scummvm/trunk/engines/lure/disk.cpp
===================================================================
--- scummvm/trunk/engines/lure/disk.cpp	2007-12-31 05:55:20 UTC (rev 30094)
+++ scummvm/trunk/engines/lure/disk.cpp	2007-12-31 05:56:22 UTC (rev 30095)
@@ -70,11 +70,13 @@
 	if (_fileNum == 0)
 		error("Could not find entry Id #%d in file %s", id, SUPPORT_FILENAME);
 	else
-		error("Could not find entry Id #%d in file disk%d.vga", id, _fileNum);
+		error("Could not find entry Id #%d in file disk%d.%s", id, _fileNum,
+			LureEngine::getReference().isEGA() ? "ega" : "vga");
 }
 
 void Disk::openFile(uint8 fileNum) {
 	// Validate that the file number is correct
+	bool isEGA = LureEngine::getReference().isEGA();
 	if (fileNum > 4)
 		error("Invalid file number specified - %d", fileNum);
 
@@ -92,7 +94,7 @@
 	if (_fileNum == 0)
 		strcpy(sFilename, SUPPORT_FILENAME);
 	else
-		sprintf(sFilename, "disk%d.vga", _fileNum);
+		sprintf(sFilename, "disk%d.%s", _fileNum, isEGA ? "ega" : "vga");
 
 	_fileHandle->open(sFilename);
 	if (!_fileHandle->isOpen())
@@ -137,7 +139,7 @@
 		error("The file %s was not a valid VGA file", sFilename);
 
 	uint16 fileFileNum = _fileHandle->readUint16BE();
-	if (fileFileNum != _fileNum)
+	if ((fileFileNum != 0) && (fileFileNum != (isEGA ? _fileNum + 4 : _fileNum)))
 		error("The file %s was not the correct file number", sFilename);
 
 	// Read in the header entries


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.