git » fp-git.git » commit 399b973

diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index b5b92f1..efeb160 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -125,15 +125,15 @@ int verifyMidiHeader(tBinary c) {
 }
 
 tResourceType verifyHeader(tBinary c) { /* TODO: add the pop version as another parameter to detect types */
-	if (verifyPop1LevelHeader (c)) return eResTypePop1Level;
-	if (verifyPop2LevelHeader (c)) return eResTypePop2Level;
-	if (verifyMidiHeader      (c)) return eResTypeMidi;
+	if (verifyPop1LevelHeader (c)) return eResTypeLevelPop1;
+	if (verifyPop2LevelHeader (c)) return eResTypeLevelPop2;
+	if (verifyMidiHeader      (c)) return eResTypeSoundMidi;
 	if (verifyImage16Header   (c)) return eResTypeImage16;
 	if (verifyImage256Header  (c)) return eResTypeImage256;
-	if (verifyPaletteHeaderPop1 (c)) return eResTypePop1Palette4bits;
-	if (verifyPaletteHeaderPop2 (c)) return eResTypePop2PaletteNColors;
-	if (verifyWaveHeader      (c)) return eResTypeWave;
+	if (verifyPaletteHeaderPop1 (c)) return eResTypePalettePop1_16;
+	if (verifyPaletteHeaderPop2 (c)) return eResTypePalettePop2_NColors;
+	if (verifyWaveHeader      (c)) return eResTypeSoundWave;
 	if (verifySpeakerHeader   (c)) return eResTypePcspeaker;
-	return eResTypeBinary;
+	return eResTypeOtherBinary;
 }
 
diff --git a/PR/src/lib/layers/pallist.c b/PR/src/lib/layers/pallist.c
index 9c1d0f6..feb9dcd 100644
--- a/PR/src/lib/layers/pallist.c
+++ b/PR/src/lib/layers/pallist.c
@@ -64,10 +64,10 @@ pl_dellist_add(tPL* pl, tResourceId idres, tObject* obj) {
 	while (node) {
 		if (resourceListCompareId(node->resid,idres)==0)e
 	}
-	
-	
 
-				
+
+
+
 }
 
 #endif
@@ -113,7 +113,7 @@ showobj(o);
 		int colors=paletteGetColors(o);
 printf("adding with low priority:\n");
 showobj(o);
-		
+
 		while (pl->list_first && colors>=paletteGetColors(pl->list_first->object)) {
 			printf("deleting: ");
 			showobj(pl->list_first->object);
@@ -133,7 +133,7 @@ tObject pl_get(tPL* pl, int* priorityRight, int colors) {
 	tPL_Node* node;
 	int junk;
 printf("getting PL\n");
-	
+
 	*priorityRight=1;
 	if (pl->priority_field.enabled) {
 		if (colors<=paletteGetColors(pl->priority_field.object)) {
@@ -147,10 +147,10 @@ showobj(pl->priority_field.object);
 	node=pl->list_first;
 printf("first=%p with ",(void*)pl->list_first);
 showobj(pl->list_first->object);
-	
+
 	while (node && colors>paletteGetColors(node->object))
 	{		node=node->next; printf("next %p\n",(void*)node); }
-	
+
 	return node?node->object:getObject(NULL,&junk);
 }
 
@@ -158,18 +158,18 @@ showobj(pl->list_first->object);
 int main(int a,char** b) {
 	tObject tests[]={
 		{eResTypeNone,NULL},
-		{eResTypePop2PaletteNColors,(void*)((int)320)},
-		{eResTypePop1Palette4bits,NULL}
+		{eResTypePalettePop2_NColors,(void*)((int)320)},
+		{eResTypePalettePop1_16,NULL}
 	};
 	tResourceId ress[]={
 		{0,"POP1",4},
 		{2,"LALA",6}
 	};
 	tPL pl=pl_create();
-	
+
 	printf("hello world\n");
 	showobj(tests[1]);
-	
+
 	pl_add(&pl, tests, ress[0], lowPriority);
 	pl_add(&pl, tests+1, ress[1], lowPriority);
 	pl_add(&pl, tests, ress[0], lowPriority);
diff --git a/PR/src/ports/winfiles/pr.dev b/PR/src/ports/winfiles/pr.dev
index e767594..3474dfd 100644
--- a/PR/src/ports/winfiles/pr.dev
+++ b/PR/src/ports/winfiles/pr.dev
@@ -943,7 +943,7 @@ BuildCmd=
 Major=1
 Minor=3
 Release=0
-Build=9
+Build=15
 LanguageID=2057
 CharsetID=1252
 CompanyName=Princed development team