git » fp-git.git » commit 812bb84

o Removed unused functions

author ecalot
2003-11-07 20:58:20 UTC
committer ecalot
2003-11-07 20:58:20 UTC
parent 68fe3288d4ddc5f4708816bc40911c5623542400
o Removed unused functions
PR/src/include/autodetect.h +3 -5
PR/src/include/common.h +24 -5
PR/src/include/idlist.h +3 -5
PR/src/include/pr.h +24 -5
PR/src/include/tree.h +3 -5
PR/src/include/unknown.h +3 -5 
diff --git a/PR/src/include/autodetect.h b/PR/src/include/autodetect.h
index 66cd6c0..8c443ca 100644
--- a/PR/src/include/autodetect.h
+++ b/PR/src/include/autodetect.h
@@ -4,10 +4,9 @@
 
 #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_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%s\">Unknown Resource number %d</item>\n"
 #define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
 #define RES_XML_UNKNOWN_FILES "%d.%s"
 
@@ -45,14 +44,13 @@ void emptyTable(tResource* r[]);
 //parse file
 char parseFile(char* vFile, char* datFile, tResource* r[]);
 
-//generate file
-char generateFile(char* vFile,tResource* r[]);
-
 //Resources extras
 
 void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
+const char* getExtDesc(int type);
+
 //In case there are unknown resources it closes the unknown XML output
 void endUnknownXml();
 
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 107ce69..b6ae424 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -7,20 +7,39 @@
 #ifndef WIN32
  #define UNIX
 #endif
-//#define DLL
-#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"
+
+/* #define DLL --> use -DDLL as a precompiler option */
+
+//Main program defines
+#define PR_ABOUT             "Princed resources (PR) V0.9\r\n(c) Copyright 2003 - Princed Development Team\r\n"\
+                             "http://www.princed.com.ar\r\n\r\n"
+
+#define PR_CGI_TEXT1         "Content-Type:text/html\n\nRunning as a cgi\n"
+#define PR_CGI_TEXT2         "Result: %02d type\r\n"
+
+#define PR_TEXT_SKIPING      "Found invalid option '%c', skiping . . .\r\n"
+#define PR_TEXT_RESULT       "Result: %s (%d)\r\n"
+#define PR_TEXT_RESULT_ERR   "Result: %d files with errors\r\n"
+
+#define PR_TEXT_SYNTAX       "Syntax:\r\n pr datfile option [extract dir]\r\n\r\nValid options:\r\n -x[rn] for extract\r\n  r: raw extraction\r\n  n: don't extract\r\n -c[r] for compile\r\n  r: raw compiling\r\n -d for type\r\n"
+
+//Default Files
+#define RES_XML_UNKNOWN_XML  "unknown.xml"
+#define RES_XML_RESOURC_XML  "resources.xml"
+
+//Difine max & min's
+#define MAX_RES_COUNT 65000
 
 //Path defines
 #ifdef UNIX
- #define DIR_SEPARATOR '/'
+ #define DIR_SEPARATOR       '/'
 #else
- #define DIR_SEPARATOR '\\'
+ #define DIR_SEPARATOR       '\\'
 #endif
 
 //Main functions
 int prExportDat(char* vDatFile, char* vDirName, char* vResFile);
 int prImportDat(char* vDatFile, char* vDirName, char* vResFile);
-int prClearRes(char* vResFile);
 int prVerifyDatType(char* vFiledat);
 
 //Extra featured functions
diff --git a/PR/src/include/idlist.h b/PR/src/include/idlist.h
index 66cd6c0..8c443ca 100644
--- a/PR/src/include/idlist.h
+++ b/PR/src/include/idlist.h
@@ -4,10 +4,9 @@
 
 #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_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%s\">Unknown Resource number %d</item>\n"
 #define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
 #define RES_XML_UNKNOWN_FILES "%d.%s"
 
@@ -45,14 +44,13 @@ void emptyTable(tResource* r[]);
 //parse file
 char parseFile(char* vFile, char* datFile, tResource* r[]);
 
-//generate file
-char generateFile(char* vFile,tResource* r[]);
-
 //Resources extras
 
 void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
+const char* getExtDesc(int type);
+
 //In case there are unknown resources it closes the unknown XML output
 void endUnknownXml();
 
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 107ce69..b6ae424 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -7,20 +7,39 @@
 #ifndef WIN32
  #define UNIX
 #endif
-//#define DLL
-#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"
+
+/* #define DLL --> use -DDLL as a precompiler option */
+
+//Main program defines
+#define PR_ABOUT             "Princed resources (PR) V0.9\r\n(c) Copyright 2003 - Princed Development Team\r\n"\
+                             "http://www.princed.com.ar\r\n\r\n"
+
+#define PR_CGI_TEXT1         "Content-Type:text/html\n\nRunning as a cgi\n"
+#define PR_CGI_TEXT2         "Result: %02d type\r\n"
+
+#define PR_TEXT_SKIPING      "Found invalid option '%c', skiping . . .\r\n"
+#define PR_TEXT_RESULT       "Result: %s (%d)\r\n"
+#define PR_TEXT_RESULT_ERR   "Result: %d files with errors\r\n"
+
+#define PR_TEXT_SYNTAX       "Syntax:\r\n pr datfile option [extract dir]\r\n\r\nValid options:\r\n -x[rn] for extract\r\n  r: raw extraction\r\n  n: don't extract\r\n -c[r] for compile\r\n  r: raw compiling\r\n -d for type\r\n"
+
+//Default Files
+#define RES_XML_UNKNOWN_XML  "unknown.xml"
+#define RES_XML_RESOURC_XML  "resources.xml"
+
+//Difine max & min's
+#define MAX_RES_COUNT 65000
 
 //Path defines
 #ifdef UNIX
- #define DIR_SEPARATOR '/'
+ #define DIR_SEPARATOR       '/'
 #else
- #define DIR_SEPARATOR '\\'
+ #define DIR_SEPARATOR       '\\'
 #endif
 
 //Main functions
 int prExportDat(char* vDatFile, char* vDirName, char* vResFile);
 int prImportDat(char* vDatFile, char* vDirName, char* vResFile);
-int prClearRes(char* vResFile);
 int prVerifyDatType(char* vFiledat);
 
 //Extra featured functions
diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index 66cd6c0..8c443ca 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -4,10 +4,9 @@
 
 #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_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%s\">Unknown Resource number %d</item>\n"
 #define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
 #define RES_XML_UNKNOWN_FILES "%d.%s"
 
@@ -45,14 +44,13 @@ void emptyTable(tResource* r[]);
 //parse file
 char parseFile(char* vFile, char* datFile, tResource* r[]);
 
-//generate file
-char generateFile(char* vFile,tResource* r[]);
-
 //Resources extras
 
 void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
+const char* getExtDesc(int type);
+
 //In case there are unknown resources it closes the unknown XML output
 void endUnknownXml();
 
diff --git a/PR/src/include/unknown.h b/PR/src/include/unknown.h
index 66cd6c0..8c443ca 100644
--- a/PR/src/include/unknown.h
+++ b/PR/src/include/unknown.h
@@ -4,10 +4,9 @@
 
 #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_ITEM  "  <item value=\"%d\" external=\"res%05d.%s\" itemtype=\"%s\">Unknown Resource number %d</item>\n"
 #define RES_XML_UNKNOWN_END   " </folder>\n</itemtypes>\n"
 #define RES_XML_UNKNOWN_FILES "%d.%s"
 
@@ -45,14 +44,13 @@ void emptyTable(tResource* r[]);
 //parse file
 char parseFile(char* vFile, char* datFile, tResource* r[]);
 
-//generate file
-char generateFile(char* vFile,tResource* r[]);
-
 //Resources extras
 
 void getFileName(char* vFileext,char* vDirExt,tResource* r,short id,char* vFiledat);
 void getUpperFolder(char* aux, char* vFiledat);
 
+const char* getExtDesc(int type);
+
 //In case there are unknown resources it closes the unknown XML output
 void endUnknownXml();