[Scummvm-git-logs] scummvm-tools master -> 0d2fb935d380ef6ccf556e2f15495e078e97ecf5

antoniou79 antoniou at cti.gr
Thu Mar 21 12:18:11 CET 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
0d2fb935d3 TOOLS: BLADERUNNER: Support CDFRAMES1.DAT input for packer


Commit: 0d2fb935d380ef6ccf556e2f15495e078e97ecf5
    https://github.com/scummvm/scummvm-tools/commit/0d2fb935d380ef6ccf556e2f15495e078e97ecf5
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-21T13:15:45+02:00

Commit Message:
TOOLS: BLADERUNNER: Support CDFRAMES1.DAT input for packer

Changed paths:
    engines/bladerunner/pack_bladerunner.cpp


diff --git a/engines/bladerunner/pack_bladerunner.cpp b/engines/bladerunner/pack_bladerunner.cpp
index ab79efe..8e01565 100644
--- a/engines/bladerunner/pack_bladerunner.cpp
+++ b/engines/bladerunner/pack_bladerunner.cpp
@@ -64,9 +64,16 @@ void PackBladeRunner::execute() {
 		hdPageOffsets[i] = -1;
 
 	Common::File in;
+	char fname[20];
 	int curCD = 1;
 
 	mainDir.setFullName("CDFRAMES.DAT");
+	if (!mainDir.exists()) {
+		warning("Could not find file %s", mainDir.getName().c_str());
+		snprintf(fname, 20, "CDFRAMES%d.DAT", curCD);		
+		mainDir.setFullName(fname);
+		warning("Retrying for file %s", mainDir.getName().c_str());
+	}
 	in.open(mainDir, "rb");
 
 	if (!in.isOpen()) {
@@ -96,7 +103,7 @@ void PackBladeRunner::execute() {
 			cdPageOffsets[i] = in.readUint32LE();
 		}
 
-		int cdCurrentPage = 0;
+		uint32 cdCurrentPage = 0;
 
 		while (cdCurrentPage < cdPageCount) {
 			while (cdCurrentPage < cdPageCount) {
@@ -128,7 +135,6 @@ void PackBladeRunner::execute() {
 		if (curCD == 5)
 			break;
 
-		char fname[20];
 		snprintf(fname, 20, "CDFRAMES%d.DAT", curCD);
 
 		mainDir.setFullName(fname);





More information about the Scummvm-git-logs mailing list