git » fp-git.git » commit cb36a78

diff --git a/PR/doc/changelog.txt b/PR/doc/changelog.txt
index 7300a87..6ddaaf2 100644
--- a/PR/doc/changelog.txt
+++ b/PR/doc/changelog.txt
@@ -138,7 +138,9 @@ Versions:
   - Solved bug in palette buffer initialization for autodetected images
   x Code the compression algorithms Lzg to optimize compiled
     bitmap dat files
-	
+
+create prlib.h
+
 2) ToDo List & Future Plans:
 
 * PR v1.1:
diff --git a/PR/src/include/autodetect.h b/PR/src/include/autodetect.h
index e41de4c..6c0a1d5 100644
--- a/PR/src/include/autodetect.h
+++ b/PR/src/include/autodetect.h
@@ -64,13 +64,13 @@ resources.h: Princed Resources : Resource Handler headers
 typedef struct {
 	unsigned short int palette;
 	unsigned short int size;
-	unsigned long int offset;
-	unsigned char number; /* Used for level number */
-	char      type;
-	char*     path;
+	unsigned long int  offset; /* Used internally in dat.c to remember the offset */
+	unsigned char      number; /* Used for level number */
+	char               type;
+	char*              path;
 	unsigned char*     palAux;
-	char*     name;
-	char*     desc;
+	char*              name;
+	char*              desc;
 }tResource;
 
 /* Id list for partial manipulation */
diff --git a/PR/src/include/idlist.h b/PR/src/include/idlist.h
index e41de4c..6c0a1d5 100644
--- a/PR/src/include/idlist.h
+++ b/PR/src/include/idlist.h
@@ -64,13 +64,13 @@ resources.h: Princed Resources : Resource Handler headers
 typedef struct {
 	unsigned short int palette;
 	unsigned short int size;
-	unsigned long int offset;
-	unsigned char number; /* Used for level number */
-	char      type;
-	char*     path;
+	unsigned long int  offset; /* Used internally in dat.c to remember the offset */
+	unsigned char      number; /* Used for level number */
+	char               type;
+	char*              path;
 	unsigned char*     palAux;
-	char*     name;
-	char*     desc;
+	char*              name;
+	char*              desc;
 }tResource;
 
 /* Id list for partial manipulation */
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 8f25962..2982a6e 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -60,21 +60,21 @@ typedef struct tTag {
 |                           Prototypes                          |
 \***************************************************************/
 /* The library EXPORTS are:
+ * freeParsedStructure
+ * freeParsingCache
+ * freeTagStructure
+ * parseStructure
+ * parseXmlFile
  * prExportDat
  * prExportDatOpt
  * prImportDat
  * prImportDatOpt
- * prVerifyDatType
  * prSetOutput
- * parseStructure
+ * prVerifyDatType
  * resourceTreeGetChild
  * resourceTreeGetInfo
  * resourceTreeGetNext
- * freeParsedStructure
  * setCompressionLevel
- * freeParsingCache
- * freeTagStructure
- * parseXmlFile
  */
 
 /* Main functions */
diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index e41de4c..6c0a1d5 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -64,13 +64,13 @@ resources.h: Princed Resources : Resource Handler headers
 typedef struct {
 	unsigned short int palette;
 	unsigned short int size;
-	unsigned long int offset;
-	unsigned char number; /* Used for level number */
-	char      type;
-	char*     path;
+	unsigned long int  offset; /* Used internally in dat.c to remember the offset */
+	unsigned char      number; /* Used for level number */
+	char               type;
+	char*              path;
 	unsigned char*     palAux;
-	char*     name;
-	char*     desc;
+	char*              name;
+	char*              desc;
 }tResource;
 
 /* Id list for partial manipulation */
diff --git a/PR/src/include/unknown.h b/PR/src/include/unknown.h
index e41de4c..6c0a1d5 100644
--- a/PR/src/include/unknown.h
+++ b/PR/src/include/unknown.h
@@ -64,13 +64,13 @@ resources.h: Princed Resources : Resource Handler headers
 typedef struct {
 	unsigned short int palette;
 	unsigned short int size;
-	unsigned long int offset;
-	unsigned char number; /* Used for level number */
-	char      type;
-	char*     path;
+	unsigned long int  offset; /* Used internally in dat.c to remember the offset */
+	unsigned char      number; /* Used for level number */
+	char               type;
+	char*              path;
 	unsigned char*     palAux;
-	char*     name;
-	char*     desc;
+	char*              name;
+	char*              desc;
 }tResource;
 
 /* Id list for partial manipulation */
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index b4ad547..17f2773 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -106,9 +106,9 @@ int mReadFileInDatFile(int k,unsigned char* *data,unsigned long  int *size) {
 	unsigned short int id;
 
 	/* for each archived file the index is read */
-	id=    array2short(indexPointer+ofk+k*recordSize);/*(indexPointer[ofk+k*recordSize])+(indexPointer[ofk+k*recordSize+1]<<8);*/
-	offset=array2long(indexPointer+ofk+k*recordSize+2);/*indexPointer[ofk+k*recordSize+2])+(indexPointer[ofk+k*recordSize+3]<<8)+(indexPointer[ofk+k*recordSize+4]<<16)+(indexPointer[ofk+k*recordSize+5]<<24);*/
-	*size= array2short(indexPointer+ofk+k*recordSize+6)+1;/*indexPointer[ofk+k*recordSize+6])+(indexPointer[ofk+k*recordSize+7]<<8)+1;*/
+	id=    array2short(indexPointer+ofk+k*recordSize);
+	offset=array2long(indexPointer+ofk+k*recordSize+2);
+	*size= array2short(indexPointer+ofk+k*recordSize+6)+1;
 	if ((!pop1)&&(!(indexPointer[ofk+k*recordSize+8]==0x40)&&(!indexPointer[ofk+k*recordSize+9])&&(!indexPointer[ofk+k*recordSize+10]))) return -1;
 	if (offset+indexSize>readDatFileSize) return -1;
 	*data=readDatFile+offset;
@@ -126,7 +126,6 @@ int mReadInitResource(tResource** res,const unsigned char* data,long size) {
 		(*res)->palette=0;
 		(*res)->number=0;
 		(*res)->size=(unsigned short int)size;
-		/* (*res)->offset=(unsigned short)offset; TODO delete this line */
 		(*res)->type=verifyHeader(data,(unsigned short int)size);
 	} else { /* If resource type is invalid or 0, the type will be decided by PR */
 		if (!((*res)->type)) (*res)->type=verifyHeader(data,(unsigned short int)size);
diff --git a/PR/src/ports/winfiles/pr.def b/PR/src/ports/winfiles/pr.def
index 3eb69d7..73a63eb 100644
--- a/PR/src/ports/winfiles/pr.def
+++ b/PR/src/ports/winfiles/pr.def
@@ -1,14 +1,16 @@
 EXPORTS
+freeParsedStructure
+freeParsingCache
+freeTagStructure
+parseStructure
+parseXmlFile
 prExportDat
 prExportDatOpt
 prImportDat
 prImportDatOpt
-prVerifyDatType
 prSetOutput
-parseFile
-parseStructure
+prVerifyDatType
 resourceTreeGetChild
 resourceTreeGetInfo
 resourceTreeGetNext
-resourceTreeGetRoot
-freeParsedStructure
+setCompressionLevel