[Scummvm-git-logs] scummvm-tools master -> 2d112d49fe8cf9bbb91ccf6f1c94fd0710a731bb

[bluegr]

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:
2d112d49fe TOOLS: pack_bladerunner Remove CDFRAMES.DAT 'missing' warning


Commit: 2d112d49fe8cf9bbb91ccf6f1c94fd0710a731bb
    https://github.com/scummvm/scummvm-tools/commit/2d112d49fe8cf9bbb91ccf6f1c94fd0710a731bb
Author: Mitch Capper (mitch.capper at gmail.com)
Date: 2022-07-08T11:37:44+03:00

Commit Message:
TOOLS: pack_bladerunner Remove CDFRAMES.DAT 'missing' warning

- Removed warning about CDFRAMES.DAT missing as only a problem if
 CDFRAMES1.DAT is missing (and it already warns on that)
- Simplify documentation to match and remove a step
- Does not change actual code behavior, should be 100% non-breaking

Changed paths:
    README
    engines/bladerunner/pack_bladerunner.cpp


diff --git a/README b/README
index 33c03a30..8eff5951 100644
--- a/README
+++ b/README
@@ -470,12 +470,10 @@ Other Tools:
         pack_bladerunner
                 Used to combine Blade Runner CDFRAMES.DAT files into HDFRAMES.DAT.
 
-                1. Copy CDFRAMES.DAT file from CD1 to some directory.
+                1. Copy CDFRAMES.DAT files from CDs 1-4 to the same directory
+                but name them CDFRAMES1.DAT - CDFRAMES4.DAT respectively.
 
-                2. Copy CDFRAMES.DAT files from CDs 2-4 to the same directory
-                but name them CDFRAMES2.DAT - CDFRAMES4.DAT respectively.
+                2. Run the tool:
+                  ./scummvm-tools-cli --tool pack_bladerunner [-o outputfile] <inputdir>/CDFRAMES1.DAT
 
-                3. Run the tool:
-                  ./scummvm-tools-cli --tool pack_bladerunner [-o outputfile] <inputdir>/CDFRAMES.DAT
-
-                4. Copy the resulting HDFRAMES.DAT file to the game directory.
+                3. Copy the resulting HDFRAMES.DAT file to the game directory.
diff --git a/engines/bladerunner/pack_bladerunner.cpp b/engines/bladerunner/pack_bladerunner.cpp
index a8523168..fe021839 100644
--- a/engines/bladerunner/pack_bladerunner.cpp
+++ b/engines/bladerunner/pack_bladerunner.cpp
@@ -69,10 +69,8 @@ void PackBladeRunner::execute() {
 
 	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");