git » fp-git.git » commit 71df244

diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index b5beb46..e45e7e8 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -204,6 +204,10 @@ PARSING_OPTRAW\
 #define hasFlag(a) (optionflag&(a))
 #define setFlag(a) optionflag|=(a)
 
+#define PR_RESULT_CHECKSUM_ERROR -24
+#define PR_RESULT_COMPRESS_RESULT_FATAL -26 
+#define PR_RESULT_COMPRESS_RESULT_WARNING -27
+#define PR_RESULT_ERR_BMP_BITRATE_DIFFERS -31
 #define PR_RESULT_ERR_COMMAND_LINE_SYNTAX -17
 #define PR_RESULT_ERR_EXTRACTION -18
 #define PR_RESULT_ERR_FILE_DAT_NOT_OPEN_NOTFOUND -2
@@ -216,6 +220,7 @@ PARSING_OPTRAW\
 #define PR_RESULT_ERR_FILE_NOT_WRITE_ACCESS -9
 #define PR_RESULT_ERR_INVALID_DAT -10
 #define PR_RESULT_ERR_MEMORY -11
+#define PR_RESULT_ERR_WRONG_PRIMITIVE_CALL -19
 #define PR_RESULT_ERR_XML_ALREADY_OPEN -15
 #define PR_RESULT_ERR_XML_ATTR -12
 #define PR_RESULT_ERR_XML_FILE -13
@@ -224,18 +229,13 @@ PARSING_OPTRAW\
 #define PR_RESULT_FD_IMPORT_FROM_MORE_THAN_ONE_DIR -20
 #define PR_RESULT_FD_IMPORT_RECURSIVE -21
 #define PR_RESULT_FD_NO_FILES_SELECTED -22
-#define PR_RESULT_INDEX_NOT_FOUND -23
-#define PR_RESULT_CHECKSUM_ERROR -24
-#define PR_RESULT_ERR_WRONG_PRIMITIVE_CALL -19
-#define PR_RESULT_XML_AND_DAT_FORMAT_DO_NOT_MATCH -25
 #define PR_RESULT_HELP_SHOWN -1
+#define PR_RESULT_INDEX_NOT_FOUND -23
 #define PR_RESULT_SUCCESS 0
-#define PR_RESULT_COMPRESS_RESULT_FATAL -26 
-#define PR_RESULT_COMPRESS_RESULT_WARNING -27
 #define PR_RESULT_WAV_UNSUPPORTED_BITRATE -28
 #define PR_RESULT_WAV_UNSUPPORTED_SAMPLERATE -29
 #define PR_RESULT_WAV_UNSUPPORTED_STEREO -30
-#define PR_RESULT_ERR_BMP_BITRATE_DIFFERS -31
-#define RESULT_PAL_UNSUPPORTED -32
+#define PR_RESULT_XML_AND_DAT_FORMAT_DO_NOT_MATCH -25
+#define PR_RESULT_PAL_UNSUPPORTED -32
 
 #endif
diff --git a/PR/src/lib/object/palette/pop1_16c.c b/PR/src/lib/object/palette/pop1_16c.c
index 02341cc..734882c 100644
--- a/PR/src/lib/object/palette/pop1_16c.c
+++ b/PR/src/lib/object/palette/pop1_16c.c
@@ -256,7 +256,7 @@ void* objPop1Palette4bitsRead(const char* file,int *result) {
 	*result=readPal(file,&colorArray,&colors);
 
 	if (*result==PR_RESULT_SUCCESS && colors!=16) {
-		*result=RESULT_PAL_UNSUPPORTED;
+		*result=PR_RESULT_PAL_UNSUPPORTED;
 		free(colorArray);
 		return NULL;
 	}
diff --git a/PR/src/lib/object/palette/pop2_256c.c b/PR/src/lib/object/palette/pop2_256c.c
index 8cf3580..7daab1e 100644
--- a/PR/src/lib/object/palette/pop2_256c.c
+++ b/PR/src/lib/object/palette/pop2_256c.c
@@ -93,7 +93,7 @@ void* objPop2PaletteNColorsRead(const char* file,int *result) {
 	*result=readPal(file,&r->colorArray,&r->size);
 
 	if (*result==PR_RESULT_SUCCESS && !(r->size==256 || r->size==320)) {
-		*result=RESULT_PAL_UNSUPPORTED;
+		*result=PR_RESULT_PAL_UNSUPPORTED;
 		free(r->colorArray);
 		free(r);
 		return NULL;