git » fp-git.git » commit a776ff1

diff --git a/PR/src/lib/actions/classify.c b/PR/src/lib/actions/classify.c
index 7015efb..4029314 100644
--- a/PR/src/lib/actions/classify.c
+++ b/PR/src/lib/actions/classify.c
@@ -32,7 +32,7 @@ tasks.c: Princed Resources : Classify a DAT file
 */
 
 #include <stdio.h>
-#include "tasks.h" /* TODO: rename tasks to classify */
+#include "tasks.h" 
 #include "memory.h"
 #include "resources.h"
 #include "dat.h"
@@ -61,7 +61,7 @@ int prVerifyDatType(const char* vFiledat) {
 	if (error=mReadBeginDatFile(&numberOfItems,vFiledat)) return error;
 
 	/* main loop */
-	for (indexNumber=0;(indexNumber<numberOfItems)&&type!=RES_TYPE_BINARY;indexNumber++) {
+	for (indexNumber=0;(indexNumber<numberOfItems)&&(type==RES_TYPE_BINARY);indexNumber++) {
 		id=mReadGetFileInDatFile(indexNumber,&data,&size);
 		if (id<0) return 0; /* Read error */
 		if (id==0xFFFF) continue; /* Tammo Jan Bug fix */
diff --git a/PR/src/lib/formats/bmp.c b/PR/src/lib/formats/bmp.c
index 7293ab4..1b8ae62 100644
--- a/PR/src/lib/formats/bmp.c
+++ b/PR/src/lib/formats/bmp.c
@@ -85,7 +85,6 @@ int mWriteBitMap(tImage img,const char* vFile,int optionflag,const char* backupE
 	/* declare variables */
 	int a;
 	int x;
-//	unsigned char carry;
 	unsigned char* b;
 	unsigned char* g;
 	unsigned char* r;
@@ -159,7 +158,6 @@ int mWriteBitMap(tImage img,const char* vFile,int optionflag,const char* backupE
 
 int mReadBitMap(tImage* image,unsigned char* data, int size) {
 	char lineSerialization;
-//	int image->widthInBytes;
 	int ok;
 	int serializedWidth;
 	int x=0;
diff --git a/PR/src/lib/formats/pal.c b/PR/src/lib/formats/pal.c
index 382d033..ff3b20b 100644
--- a/PR/src/lib/formats/pal.c
+++ b/PR/src/lib/formats/pal.c
@@ -55,8 +55,8 @@ int mFormatExportPal(const unsigned char* data, char *vFileext,unsigned long int
 	int i;
 
 	/* Export extra palette information */
-	sprintf(aux,"%s.more",vFileext);
-	writeData(data,1,aux,size,optionflag,backupExtension);
+	sprintf((char*)aux,"%s.more",vFileext);
+	writeData(data,1,(char*)aux,size,optionflag,backupExtension);
 
 	/* Convert palette from POP format to JASC format */
 	strcpy((char*)pal,PAL_HEADER);
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index 9144a35..605121a 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -58,6 +58,15 @@ void mReadCloseDatFile() {
 }
 
 int mReadBeginDatFile(unsigned short int *numberOfItems,const char* vFiledat){
+	/* 
+		Return Values:
+			-1 Wrong format
+	 *
+	 *
+	 *
+	 *
+	*/
+
 	int ok;
 	unsigned char* readDatFilePoint;
 
@@ -74,9 +83,8 @@ int mReadBeginDatFile(unsigned short int *numberOfItems,const char* vFiledat){
 	indexSize=array2short(readDatFilePoint);
 
 	if ((indexOffset>readDatFileSize)&&((indexOffset+indexSize)!=readDatFileSize)) {
-		printf("a\n");
 		free(readDatFile);
-		return -3; /* this is not a valid prince dat file */
+		return -1; /* this is not a valid prince dat file */
 	}
 
 	indexPointer=readDatFile+indexOffset;