[Scummvm-cvs-logs] SF.net SVN: scummvm: [27711] tools/trunk/compress_saga.cpp

[thebluegr at users.sourceforge.net]

Revision: 27711
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27711&view=rev
Author:   thebluegr
Date:     2007-06-25 11:20:26 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Changed the output of the SAGA compression tool to be files with the .cmp extension

Modified Paths:
--------------
    tools/trunk/compress_saga.cpp

Modified: tools/trunk/compress_saga.cpp
===================================================================
--- tools/trunk/compress_saga.cpp	2007-06-25 17:18:51 UTC (rev 27710)
+++ tools/trunk/compress_saga.cpp	2007-06-25 18:20:26 UTC (rev 27711)
@@ -235,6 +235,8 @@
 #define RSC_TABLEENTRY_SIZE 8
 
 void sagaEncode(const char *inputFileName) {
+	char inputFileNameWithExt[256];
+	char outputFileNameWithExt[256];
 	FILE *inputFile;
 	FILE *outputFile;
 	uint32 inputFileSize;
@@ -245,7 +247,7 @@
 	Record *inputTable;
 	Record *outputTable;
 	GameFileDescription *currentFileDescription;
-	GameSoundInfo *soundInfo;
+	GameSoundInfo *soundInfo = NULL;
 
 	currentFileDescription = &currentGameDescription->filesDescriptions[currentFileIndex];
 	
@@ -255,7 +257,8 @@
 		isBigEndian = !isBigEndian;
 	///isBigEndian = false;
 
-	inputFile = fopen(inputFileName, "rb");
+	sprintf(inputFileNameWithExt, "%s.rsc", inputFileName);
+	inputFile = fopen(inputFileNameWithExt, "rb");
 	inputFileSize = fileSize(inputFile);
 	printf("filesize: %ul\n", inputFileSize);
 	/*
@@ -303,9 +306,10 @@
 
 	}
 	outputTable = (Record*)malloc(resTableCount * sizeof(Record));
-	
-	outputFile = fopen("out.res", "wb");
 
+	sprintf(outputFileNameWithExt, "%s.cmp", inputFileName);	
+	outputFile = fopen(outputFileNameWithExt, "wb");
+
 	for (i = 0; i < resTableCount; i++) {
 		fseek(inputFile, inputTable[i].offset, SEEK_SET);
 		outputTable[i].offset = ftell(outputFile);
@@ -339,6 +343,9 @@
 	free(inputTable);
 	free(outputTable);
 	
+	// Cleanup
+	unlink(TEMP_RAW);
+	unlink(tempEncoded);
 
 	printf("Done!\n");
 }
@@ -383,6 +390,7 @@
 int main(int argc, char *argv[]) {
 	int		i;
 	char *inputFileName;
+	char inputFileNameWithExt[256];
 
 	if (argc < 2)
 		showhelp(argv[0]);
@@ -420,7 +428,9 @@
 
 	i = argc - 1;
 	inputFileName = argv[i];
-	if (detectFile(inputFileName))
+
+	sprintf(inputFileNameWithExt, "%s.rsc", inputFileName);
+	if (detectFile(inputFileNameWithExt))
 		sagaEncode(inputFileName);
 
 	return (0);


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