git » fp-git.git » commit 00a0ac9

diff --git a/PR/src/include/autodetect.h b/PR/src/include/autodetect.h
index 2905db2..66cd6c0 100644
--- a/PR/src/include/autodetect.h
+++ b/PR/src/include/autodetect.h
@@ -2,20 +2,23 @@
 #ifndef _RESOURCES_H_
 #define _RESOURCES_H_
 
-#define HEADER      "Princed V3.0 alpha game resources list\n(c) Copyright 2003 - Enrique P. Calot\n(c) Copyright 2003 - Princed Development Team\n\nSyntax:\nId    Size  Offset    File    Type Description       Comments\nXXXXX YYYYY ZZZZZ SSSSSSSS.DAT TT Ddddddddddddd...  #cccccccc....\n\nComments are optional\n\nNote:\n You can edit description and commets here in the file and\n they will be saved in the dat files.\n\nResource Types:\n 01 Levels\n 02 Bitmaps\n 03 Waves\n 04 Midis\n"
-#define BEGIN_TABLE "BEGIN resources table\n"
-#define END_TABLE   "END resources table\n"
-
 #define MAX_LINE_SIZE 300
 
+#define RES_XML_UNKNOWN_XML   "unknown.xml"
+#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
+#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<itemtypes version=\"0.6\">\n <folder name=\"unknown\" file=\"%s\" external=\"%s\" palette=\"%d\">\n"
+#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%d\">Unknown Resource number %d</item>\n"
+#define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
+#define RES_XML_UNKNOWN_FILES "%d.%s"
+
 //types
 typedef struct {
+	unsigned short int palette;
 	unsigned short int size;
 	unsigned short int offset;
-	char      file[13];
 	char      type;
-	char*     desc;
-	char*     coms;
+	char*     path;
+	char*     palAux;
 }tResource;
 
 //Verify  header
@@ -29,6 +32,7 @@ char verifyHeader(char* array, int size);
 	 04 Midis
 	 05 Undefined
 	 06 Palette
+	 07 Speaker Sounds
 */
 
 /***************************************************************\
@@ -39,18 +43,17 @@ char verifyHeader(char* array, int size);
 void emptyTable(tResource* r[]);
 
 //parse file
-char parseFile(char* vFile,tResource* r[]);
+char parseFile(char* vFile, char* datFile, tResource* r[]);
 
 //generate file
 char generateFile(char* vFile,tResource* r[]);
 
 //Resources extras
 
-void getFileName(char* vFileext,char* vDirExt,char type, unsigned short int id);
+void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
-//File handrling
-int mLoadFileArray(char* vFile,unsigned char** array);
-char mSaveRaw(char* vFile,unsigned char* output, int size);
+//In case there are unknown resources it closes the unknown XML output
+void endUnknownXml();
 
 #endif
diff --git a/PR/src/include/classify.h b/PR/src/include/classify.h
index 80dc3c6..d7257d9 100644
--- a/PR/src/include/classify.h
+++ b/PR/src/include/classify.h
@@ -1,5 +1,6 @@
 
-//int verifyDatType(char* vFiledat);
+#ifndef _TASKS_H_
+#define _TASKS_H_
 
 /*
 	Return values may be:
@@ -14,13 +15,11 @@
 	 04 Midis file
 	 05 Valid DAT file with Undefined content
 	 06 Graphic file with a palette in the first valid entry (common)
+	 07 PC Speaker dat file
 
 	 11 Pop2 dat files
 */
 
-#ifndef _TASKS_H_
-#define _TASKS_H_
-
 int prVerifyDatType(char* vFiledat);
 
 #endif
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index fc61ccb..107ce69 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -8,7 +8,7 @@
  #define UNIX
 #endif
 //#define DLL
-#define PR_ABOUT "Princed resources (PR) V0.7\r\n(c) Copyright 2003 - Princed Development Team\r\nhttp://www.princed.com.ar\r\n\r\n"
+#define PR_ABOUT "Princed resources (PR) V0.8 beta\r\n(c) Copyright 2003 - Princed Development Team\r\nhttp://www.princed.com.ar\r\n\r\n"
 
 //Path defines
 #ifdef UNIX
diff --git a/PR/src/include/compress.h b/PR/src/include/compress.h
index 86bb540..f64551d 100644
--- a/PR/src/include/compress.h
+++ b/PR/src/include/compress.h
@@ -1,8 +1,7 @@
 
-#ifndef _PG_H_
-#define _PG_H_
+#ifndef _COMPRESS_H_
+#define _COMPRESS_H_
 
-#define SIZE_OF_FILE    64*1024
 #define SIZE_OF_ARRAY   1000
 #define SIZE_OF_PALETTE 3*16
 
@@ -22,7 +21,7 @@ typedef struct {
 
 //Prototypes:
 
-int mCompressGraphic(unsigned char* a,tImage i, int* size);
+int mCompressGraphic(unsigned char* a,tImage* i, int* size);
 int mExpandGraphic(char* array,tImage *image, int size);
 
 /*
diff --git a/PR/src/include/export.h b/PR/src/include/export.h
index 3cbf13a..d5cf464 100644
--- a/PR/src/include/export.h
+++ b/PR/src/include/export.h
@@ -4,8 +4,6 @@
 
 #include "resources.h"
 
-char writeData(unsigned char* data, int ignoreChars, char* vFileext, int size);
-
 /***************************************************************\
 |                     M A I N   E X T R A C T                   |
 \***************************************************************/
diff --git a/PR/src/include/idlist.h b/PR/src/include/idlist.h
index 2905db2..66cd6c0 100644
--- a/PR/src/include/idlist.h
+++ b/PR/src/include/idlist.h
@@ -2,20 +2,23 @@
 #ifndef _RESOURCES_H_
 #define _RESOURCES_H_
 
-#define HEADER      "Princed V3.0 alpha game resources list\n(c) Copyright 2003 - Enrique P. Calot\n(c) Copyright 2003 - Princed Development Team\n\nSyntax:\nId    Size  Offset    File    Type Description       Comments\nXXXXX YYYYY ZZZZZ SSSSSSSS.DAT TT Ddddddddddddd...  #cccccccc....\n\nComments are optional\n\nNote:\n You can edit description and commets here in the file and\n they will be saved in the dat files.\n\nResource Types:\n 01 Levels\n 02 Bitmaps\n 03 Waves\n 04 Midis\n"
-#define BEGIN_TABLE "BEGIN resources table\n"
-#define END_TABLE   "END resources table\n"
-
 #define MAX_LINE_SIZE 300
 
+#define RES_XML_UNKNOWN_XML   "unknown.xml"
+#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
+#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<itemtypes version=\"0.6\">\n <folder name=\"unknown\" file=\"%s\" external=\"%s\" palette=\"%d\">\n"
+#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%d\">Unknown Resource number %d</item>\n"
+#define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
+#define RES_XML_UNKNOWN_FILES "%d.%s"
+
 //types
 typedef struct {
+	unsigned short int palette;
 	unsigned short int size;
 	unsigned short int offset;
-	char      file[13];
 	char      type;
-	char*     desc;
-	char*     coms;
+	char*     path;
+	char*     palAux;
 }tResource;
 
 //Verify  header
@@ -29,6 +32,7 @@ char verifyHeader(char* array, int size);
 	 04 Midis
 	 05 Undefined
 	 06 Palette
+	 07 Speaker Sounds
 */
 
 /***************************************************************\
@@ -39,18 +43,17 @@ char verifyHeader(char* array, int size);
 void emptyTable(tResource* r[]);
 
 //parse file
-char parseFile(char* vFile,tResource* r[]);
+char parseFile(char* vFile, char* datFile, tResource* r[]);
 
 //generate file
 char generateFile(char* vFile,tResource* r[]);
 
 //Resources extras
 
-void getFileName(char* vFileext,char* vDirExt,char type, unsigned short int id);
+void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
-//File handrling
-int mLoadFileArray(char* vFile,unsigned char** array);
-char mSaveRaw(char* vFile,unsigned char* output, int size);
+//In case there are unknown resources it closes the unknown XML output
+void endUnknownXml();
 
 #endif
diff --git a/PR/src/include/image.h b/PR/src/include/image.h
index 86bb540..f64551d 100644
--- a/PR/src/include/image.h
+++ b/PR/src/include/image.h
@@ -1,8 +1,7 @@
 
-#ifndef _PG_H_
-#define _PG_H_
+#ifndef _COMPRESS_H_
+#define _COMPRESS_H_
 
-#define SIZE_OF_FILE    64*1024
 #define SIZE_OF_ARRAY   1000
 #define SIZE_OF_PALETTE 3*16
 
@@ -22,7 +21,7 @@ typedef struct {
 
 //Prototypes:
 
-int mCompressGraphic(unsigned char* a,tImage i, int* size);
+int mCompressGraphic(unsigned char* a,tImage* i, int* size);
 int mExpandGraphic(char* array,tImage *image, int size);
 
 /*
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index fc61ccb..107ce69 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -8,7 +8,7 @@
  #define UNIX
 #endif
 //#define DLL
-#define PR_ABOUT "Princed resources (PR) V0.7\r\n(c) Copyright 2003 - Princed Development Team\r\nhttp://www.princed.com.ar\r\n\r\n"
+#define PR_ABOUT "Princed resources (PR) V0.8 beta\r\n(c) Copyright 2003 - Princed Development Team\r\nhttp://www.princed.com.ar\r\n\r\n"
 
 //Path defines
 #ifdef UNIX
diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index 2905db2..66cd6c0 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -2,20 +2,23 @@
 #ifndef _RESOURCES_H_
 #define _RESOURCES_H_
 
-#define HEADER      "Princed V3.0 alpha game resources list\n(c) Copyright 2003 - Enrique P. Calot\n(c) Copyright 2003 - Princed Development Team\n\nSyntax:\nId    Size  Offset    File    Type Description       Comments\nXXXXX YYYYY ZZZZZ SSSSSSSS.DAT TT Ddddddddddddd...  #cccccccc....\n\nComments are optional\n\nNote:\n You can edit description and commets here in the file and\n they will be saved in the dat files.\n\nResource Types:\n 01 Levels\n 02 Bitmaps\n 03 Waves\n 04 Midis\n"
-#define BEGIN_TABLE "BEGIN resources table\n"
-#define END_TABLE   "END resources table\n"
-
 #define MAX_LINE_SIZE 300
 
+#define RES_XML_UNKNOWN_XML   "unknown.xml"
+#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
+#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<itemtypes version=\"0.6\">\n <folder name=\"unknown\" file=\"%s\" external=\"%s\" palette=\"%d\">\n"
+#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%d\">Unknown Resource number %d</item>\n"
+#define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
+#define RES_XML_UNKNOWN_FILES "%d.%s"
+
 //types
 typedef struct {
+	unsigned short int palette;
 	unsigned short int size;
 	unsigned short int offset;
-	char      file[13];
 	char      type;
-	char*     desc;
-	char*     coms;
+	char*     path;
+	char*     palAux;
 }tResource;
 
 //Verify  header
@@ -29,6 +32,7 @@ char verifyHeader(char* array, int size);
 	 04 Midis
 	 05 Undefined
 	 06 Palette
+	 07 Speaker Sounds
 */
 
 /***************************************************************\
@@ -39,18 +43,17 @@ char verifyHeader(char* array, int size);
 void emptyTable(tResource* r[]);
 
 //parse file
-char parseFile(char* vFile,tResource* r[]);
+char parseFile(char* vFile, char* datFile, tResource* r[]);
 
 //generate file
 char generateFile(char* vFile,tResource* r[]);
 
 //Resources extras
 
-void getFileName(char* vFileext,char* vDirExt,char type, unsigned short int id);
+void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
-//File handrling
-int mLoadFileArray(char* vFile,unsigned char** array);
-char mSaveRaw(char* vFile,unsigned char* output, int size);
+//In case there are unknown resources it closes the unknown XML output
+void endUnknownXml();
 
 #endif
diff --git a/PR/src/include/unknown.h b/PR/src/include/unknown.h
index 2905db2..66cd6c0 100644
--- a/PR/src/include/unknown.h
+++ b/PR/src/include/unknown.h
@@ -2,20 +2,23 @@
 #ifndef _RESOURCES_H_
 #define _RESOURCES_H_
 
-#define HEADER      "Princed V3.0 alpha game resources list\n(c) Copyright 2003 - Enrique P. Calot\n(c) Copyright 2003 - Princed Development Team\n\nSyntax:\nId    Size  Offset    File    Type Description       Comments\nXXXXX YYYYY ZZZZZ SSSSSSSS.DAT TT Ddddddddddddd...  #cccccccc....\n\nComments are optional\n\nNote:\n You can edit description and commets here in the file and\n they will be saved in the dat files.\n\nResource Types:\n 01 Levels\n 02 Bitmaps\n 03 Waves\n 04 Midis\n"
-#define BEGIN_TABLE "BEGIN resources table\n"
-#define END_TABLE   "END resources table\n"
-
 #define MAX_LINE_SIZE 300
 
+#define RES_XML_UNKNOWN_XML   "unknown.xml"
+#define RES_XML_UNKNOWN_PATH  "%s/unknown/%s/"
+#define RES_XML_UNKNOWN_START "<?xml version=\"1.0\" ?>\n<itemtypes version=\"0.6\">\n <folder name=\"unknown\" file=\"%s\" external=\"%s\" palette=\"%d\">\n"
+#define RES_XML_UNKNOWN_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%d\">Unknown Resource number %d</item>\n"
+#define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
+#define RES_XML_UNKNOWN_FILES "%d.%s"
+
 //types
 typedef struct {
+	unsigned short int palette;
 	unsigned short int size;
 	unsigned short int offset;
-	char      file[13];
 	char      type;
-	char*     desc;
-	char*     coms;
+	char*     path;
+	char*     palAux;
 }tResource;
 
 //Verify  header
@@ -29,6 +32,7 @@ char verifyHeader(char* array, int size);
 	 04 Midis
 	 05 Undefined
 	 06 Palette
+	 07 Speaker Sounds
 */
 
 /***************************************************************\
@@ -39,18 +43,17 @@ char verifyHeader(char* array, int size);
 void emptyTable(tResource* r[]);
 
 //parse file
-char parseFile(char* vFile,tResource* r[]);
+char parseFile(char* vFile, char* datFile, tResource* r[]);
 
 //generate file
 char generateFile(char* vFile,tResource* r[]);
 
 //Resources extras
 
-void getFileName(char* vFileext,char* vDirExt,char type, unsigned short int id);
+void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
-//File handrling
-int mLoadFileArray(char* vFile,unsigned char** array);
-char mSaveRaw(char* vFile,unsigned char* output, int size);
+//In case there are unknown resources it closes the unknown XML output
+void endUnknownXml();
 
 #endif