[Scummvm-cvs-logs] scummvm-tools master -> 0dc8e525195b157174d18226953c7b7b7bdc09a9

[clone2727]

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

Summary:
b0205afc44 TOOLS: Add a tool for setting the creator/type codes of pegasus save files
0dc8e52519 Merge pull request #3 from clone2727/pegasus


Commit: b0205afc44cb6a8234fa73c560b92b5c17c87e09
    https://github.com/scummvm/scummvm-tools/commit/b0205afc44cb6a8234fa73c560b92b5c17c87e09
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-03-21T12:23:50-07:00

Commit Message:
TOOLS: Add a tool for setting the creator/type codes of pegasus save files

Changed paths:
  A engines/pegasus/pegasus_save_types.cpp
    Makefile.common



diff --git a/Makefile.common b/Makefile.common
index 49c2119..9c45270 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -54,6 +54,11 @@ PROGRAMS += \
 	scummvm-tools
 endif
 
+ifdef MACOSX
+PROGRAMS += \
+	pegasus_save_types
+endif
+
 # TODO: We don't currently set USE_GTK in configure, so the user would have
 # to manually specify it
 ifdef USE_GTK
@@ -167,6 +172,11 @@ construct_mohawk_OBJS := \
 	engines/mohawk/construct_mohawk.o \
 	$(UTILS)
 
+pegasus_save_types_OBJS := \
+	engines/pegasus/pegasus_save_types.o \
+	$(UTILS)
+pegasus_save_types_LIBS := -framework CoreServices
+
 create_sjisfnt_OBJS := create_sjisfnt.o $(UTILS)
 create_sjisfnt_LIBS := $(FREETYPELIBS) $(ICONVLIBS)
 # Set custom build flags
diff --git a/engines/pegasus/pegasus_save_types.cpp b/engines/pegasus/pegasus_save_types.cpp
new file mode 100755
index 0000000..6b6d5bd
--- /dev/null
+++ b/engines/pegasus/pegasus_save_types.cpp
@@ -0,0 +1,88 @@
+/* pegasus_save_types - add creator and file type attributes to pegasus save files
+ * Copyright (C) 2012 The ScummVM Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <CoreServices/CoreServices.h>
+
+#include "common/endian.h"
+#include "common/file.h"
+#include "common/str.h"
+
+static const uint32 kPegasusCreator = MKID_BE('JPPP');
+static const uint32 kPegasusDisc1 = MKID_BE('PPG1');
+static const uint32 kPegasusDisc2 = MKID_BE('PPG2');
+static const uint32 kPegasusDisc3 = MKID_BE('PPG3');
+static const uint32 kPegasusDisc4 = MKID_BE('PPG4');
+
+int main(int argc, char **argv) {
+	if (argc < 2) {
+		printf("Usage: %s <save file>\n", argv[0]);
+		printf("Applies the creator and type codes so the save can be used\n");
+		printf("by the original interpreter.\n");
+		return 0;
+	}
+
+	uint32 creator, type;
+
+	// First, let's open our file to make sure it's a pegasus save
+	// Also, we're going to extract what type we need to set (for the correct disc)
+	try {
+		Common::File file(argv[1], "rb");
+
+		// Let's make sure the user already gunzip'd the file
+		uint16 gzipTest = file.readUint16BE();
+		if (gzipTest == 0x1F8B) {
+			printf("Please gunzip the save file first\n");
+			return 1;
+		}
+
+		creator = (gzipTest << 16) | file.readUint16BE(); // Too lazy to seek back :P
+		type = file.readUint32BE();
+
+		if (creator != kPegasusCreator) {
+			printf("Failed to find pegasus creator in save file\n");
+			return 1;
+		}
+
+		if (type != kPegasusDisc1 && type != kPegasusDisc2 && type != kPegasusDisc3 && type != kPegasusDisc4) {
+			printf("Invalid pegasus save type in save file\n");
+			return 1;
+		}
+	} catch (Common::FileException e) {
+		printf("File error: '%s'\n", e.what());
+		return 1;
+	}
+
+	FSCatalogInfo catInfo;
+	FSRef ref;
+
+	if (!FSPathMakeRef((const UInt8 *)argv[1], &ref, false)) {
+		FSGetCatalogInfo(&ref, kFSCatInfoFinderInfo, &catInfo, 0, 0, 0);
+		FileInfo *info = (FileInfo *)catInfo.finderInfo;
+		info->fileCreator = creator;
+		info->fileType = type;
+		FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &catInfo);
+	} else {
+		printf("Failed to use File Manager to open the file\n");
+		return 1;
+	}
+
+	printf("Success!\n");
+	return 0;
+}


Commit: 0dc8e525195b157174d18226953c7b7b7bdc09a9
    https://github.com/scummvm/scummvm-tools/commit/0dc8e525195b157174d18226953c7b7b7bdc09a9
Author: clone2727 (clone2727 at gmail.com)
Date: 2012-11-30T08:19:18-08:00

Commit Message:
Merge pull request #3 from clone2727/pegasus

TOOLS: Add a tool for setting the creator/type codes of pegasus save files

Changed paths:
  A engines/pegasus/pegasus_save_types.cpp
    Makefile.common