git » fp-git.git » commit 6c3208a

diff --git a/PR/src/include/reslist.h b/PR/src/include/reslist.h
index 73f0f34..07f3a0b 100644
--- a/PR/src/include/reslist.h
+++ b/PR/src/include/reslist.h
@@ -40,14 +40,15 @@ reslist.h: Princed Resources : Resource list
 /* Item Types */
 
 typedef enum {
-RES_TYPE_RAW=0,
-RES_TYPE_LEVEL=1,
-RES_TYPE_IMAGE=2,
-RES_TYPE_WAVE=3,
-RES_TYPE_MIDI=4,
-RES_TYPE_BINARY=5,
-RES_TYPE_PALETTE=6,
-RES_TYPE_PCSPEAKER=7} tResourceType;
+	eResTypeRaw=0,
+	eResTypeLevel=1,
+	eResTypeImage=2,
+	eResTypeWave=3,
+	eResTypeMidi=4,
+	eResTypeBinary=5,
+	eResTypePalette=6,
+	eResTypePcspeaker=7
+} tResourceType;
 
 /* types */
 typedef struct {
diff --git a/PR/src/include/types.h b/PR/src/include/types.h
index 73f0f34..07f3a0b 100644
--- a/PR/src/include/types.h
+++ b/PR/src/include/types.h
@@ -40,14 +40,15 @@ reslist.h: Princed Resources : Resource list
 /* Item Types */
 
 typedef enum {
-RES_TYPE_RAW=0,
-RES_TYPE_LEVEL=1,
-RES_TYPE_IMAGE=2,
-RES_TYPE_WAVE=3,
-RES_TYPE_MIDI=4,
-RES_TYPE_BINARY=5,
-RES_TYPE_PALETTE=6,
-RES_TYPE_PCSPEAKER=7} tResourceType;
+	eResTypeRaw=0,
+	eResTypeLevel=1,
+	eResTypeImage=2,
+	eResTypeWave=3,
+	eResTypeMidi=4,
+	eResTypeBinary=5,
+	eResTypePalette=6,
+	eResTypePcspeaker=7
+} tResourceType;
 
 /* types */
 typedef struct {
diff --git a/PR/src/lib/actions/classify.c b/PR/src/lib/actions/classify.c
index 4835d1f..4fbf8b3 100644
--- a/PR/src/lib/actions/classify.c
+++ b/PR/src/lib/actions/classify.c
@@ -47,7 +47,7 @@ tasks.c: Princed Resources : Classify a DAT file
 
 int prClassifyDat(const char* vFiledat) {
 	int                indexNumber;
-	tResourceType      type=RES_TYPE_BINARY;
+	tResourceType      type=eResTypeBinary;
 	unsigned short int numberOfItems;
 	tPopVersion        popVersion;
 	tResource          res;
@@ -59,7 +59,7 @@ int prClassifyDat(const char* vFiledat) {
 	popVersion=mReadGetVersion();
 
 	/* main loop */
-	for (indexNumber=0;(indexNumber<numberOfItems)&&(type==RES_TYPE_BINARY);indexNumber++) {
+	for (indexNumber=0;(indexNumber<numberOfItems)&&(type==eResTypeBinary);indexNumber++) {
 		if (!mReadFileInDatFile(&res,indexNumber)) READ_ERROR; /* Read error */
 		if (res.id.value==0xFFFF) continue; /* Tammo Jan Bug fix */
 		type=verifyHeader(res.data,res.size);
diff --git a/PR/src/lib/actions/export.c b/PR/src/lib/actions/export.c
index b04fa4b..91d8de2 100644
--- a/PR/src/lib/actions/export.c
+++ b/PR/src/lib/actions/export.c
@@ -106,14 +106,14 @@ int extract(const char* vFiledat,const char* vDirExt, tResourceList* r, int opti
 				getFileName(vFileext,vDirExt,&res,vFiledat,vDatFileName,optionflag,backupExtension);
 
 				switch (res.type) {
-						case RES_TYPE_LEVEL:
+						case eResTypeLevel:
 						ok=mFormatExportPlv(res.data,vFileext,res.size,res.number,vDatFileName,res.name,res.desc,vDatAuthor,optionflag,backupExtension);
 						break;
-					case RES_TYPE_BINARY: /* Binary files */
-					case RES_TYPE_RAW: /* Raw files */
+					case eResTypeBinary: /* Binary files */
+					case eResTypeRaw: /* Raw files */
 						ok=writeData(res.data,1,vFileext,res.size,optionflag,backupExtension); /* Ignore checksum */
 						break;
-					case RES_TYPE_PALETTE: /* save and remember palette file */
+					case eResTypePalette: /* save and remember palette file */
 						/* This will remember the palette for the next images
 						 * (because it's more probable to get all the images after its palette) */
 						mLoadPalette(res.data,image,mReadGetVersion());
@@ -122,14 +122,14 @@ int extract(const char* vFiledat,const char* vDirExt, tResourceList* r, int opti
 						/* This will export the palette */
 						ok=mFormatExportPal(res.data,vFileext,res.size,optionflag,backupExtension);
 						break;
-					case RES_TYPE_PCSPEAKER: /* save pcs file */
-					case RES_TYPE_MIDI:	/* save midi file */
+					case eResTypePcspeaker: /* save pcs file */
+					case eResTypeMidi:	/* save midi file */
 						ok=mFormatExportMid(res.data,vFileext,res.size,optionflag,backupExtension);
 						break;
-					case RES_TYPE_WAVE: /* save wav file */
+					case eResTypeWave: /* save wav file */
 						ok=mFormatExportWav(res.data,vFileext,res.size,optionflag,backupExtension);
 						break;
-					case RES_TYPE_IMAGE: /* save image */
+					case eResTypeImage: /* save image */
 						/* Palette handling */
 						if (resIdCmp(res.palette,bufferedPalette)) { /* The palette isn't in the buffer */
 							tResource readPalette;
diff --git a/PR/src/lib/actions/import.c b/PR/src/lib/actions/import.c
index 2cb146a..c6fcff7 100644
--- a/PR/src/lib/actions/import.c
+++ b/PR/src/lib/actions/import.c
@@ -62,18 +62,18 @@ extern FILE* outputStream;
 int mAddCompiledFileToDatFile(tResource* res,const char* vFile) {
 	/* return 1 	if ok, 0 	if error */
 	switch (res->type) {
-		case RES_TYPE_LEVEL:
+		case eResTypeLevel:
 			return mFormatImportPlv(res);
-		case RES_TYPE_IMAGE:
+		case eResTypeImage:
 			return mFormatImportBmp(res);
-		case RES_TYPE_WAVE:
+		case eResTypeWave:
 			return mFormatImportWav(res);
-		case RES_TYPE_MIDI:
-		case RES_TYPE_PCSPEAKER:
+		case eResTypeMidi:
+		case eResTypePcspeaker:
 			return mFormatImportMid(res);
-		case RES_TYPE_PALETTE:
+		case eResTypePalette:
 			return mFormatImportPal(res,vFile);
-		case RES_TYPE_BINARY:
+		case eResTypeBinary:
 		default:
 			mWriteFileInDatFile(res);
 			break;
diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index 63ce928..f3aae6e 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -84,12 +84,12 @@ int verifyMidiHeader(const unsigned char *array, int size) {
 }
 
 tResourceType verifyHeader(const unsigned char *array, int size) {
-	if (verifyLevelHeader  (array,size)) return RES_TYPE_LEVEL;
-	if (verifyMidiHeader   (array,size)) return RES_TYPE_MIDI;
-	if (verifyImageHeader  (array,size)) return RES_TYPE_IMAGE;
-	if (verifyPaletteHeader(array,size)) return RES_TYPE_PALETTE;
-	if (verifyWaveHeader   (array,size)) return RES_TYPE_WAVE;
-	if (verifySpeakerHeader(array,size)) return RES_TYPE_PCSPEAKER;
-	return RES_TYPE_BINARY;
+	if (verifyLevelHeader  (array,size)) return eResTypeLevel;
+	if (verifyMidiHeader   (array,size)) return eResTypeMidi;
+	if (verifyImageHeader  (array,size)) return eResTypeImage;
+	if (verifyPaletteHeader(array,size)) return eResTypePalette;
+	if (verifyWaveHeader   (array,size)) return eResTypeWave;
+	if (verifySpeakerHeader(array,size)) return eResTypePcspeaker;
+	return eResTypeBinary;
 }
 
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index c576f32..90d8efb 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -94,7 +94,7 @@ void AddToUnknownXml(const char* vFiledatWithPath,tResourceId id,const char* ext
 		if (!writeOpen(xmlFile,&unknownXmlFile,optionflag)) return;
 
 		/* Save headers */
-		if (type==RES_TYPE_PALETTE) pal=id;
+		if (type==eResTypePalette) pal=id;
 		fprintf(unknownXmlFile,RES_XML_UNKNOWN_START,
 			vFiledat,vFiledatWithPath,pal.value,toLower(pal.index)
 		);
@@ -123,7 +123,7 @@ void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const cha
 	int pos;
 
 	if (r->path==NULL) {
-		pos=((r->type<RES_TYPECOUNT)&&(r->type>=0))?r->type:RES_TYPE_BINARY;
+		pos=((r->type<RES_TYPECOUNT)&&(r->type>=0))?r->type:eResTypeBinary;
 		typeCount[pos]++;
 
 		/* set filename */
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index c576f32..90d8efb 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -94,7 +94,7 @@ void AddToUnknownXml(const char* vFiledatWithPath,tResourceId id,const char* ext
 		if (!writeOpen(xmlFile,&unknownXmlFile,optionflag)) return;
 
 		/* Save headers */
-		if (type==RES_TYPE_PALETTE) pal=id;
+		if (type==eResTypePalette) pal=id;
 		fprintf(unknownXmlFile,RES_XML_UNKNOWN_START,
 			vFiledat,vFiledatWithPath,pal.value,toLower(pal.index)
 		);
@@ -123,7 +123,7 @@ void getFileName(char* vFileext,const char* vDirExt,const tResource* r,const cha
 	int pos;
 
 	if (r->path==NULL) {
-		pos=((r->type<RES_TYPECOUNT)&&(r->type>=0))?r->type:RES_TYPE_BINARY;
+		pos=((r->type<RES_TYPECOUNT)&&(r->type>=0))?r->type:eResTypeBinary;
 		typeCount[pos]++;
 
 		/* set filename */