git » fp-git.git » commit f7dcc23

bugfixed

author ecalot
2006-02-17 23:53:24 UTC
committer ecalot
2006-02-17 23:53:24 UTC
parent 6e301cbe7bc41aa69a60b49b8268d0dc31d0192b

bugfixed

PR/src/lib/actions/export.c +1 -0
PR/src/lib/layers/reslist.c +1 -1
PR/src/lib/object/object.c +1 -0

diff --git a/PR/src/lib/actions/export.c b/PR/src/lib/actions/export.c
index e0aca26..f693ffb 100644
--- a/PR/src/lib/actions/export.c
+++ b/PR/src/lib/actions/export.c
@@ -119,6 +119,7 @@ int extract(const char* vFiledat,const char* vDirExt, tResourceList* r, int opti
 					}	break;
 					case eResTypeImage: /* save image */
 						/* Palette handling */
+printf("id=(%d,%s,%d)\n",res.paletteId.value,res.paletteId.index,res.paletteId.order);
 						if (resourceListCompareId(res.paletteId,bufferedPalette) /*TODO: add &&!paletteCheckCompatibility(currentPalette,image) */) { /* The palette isn't in the buffer */
 							tResource otherPalette;
 							otherPalette.id=res.paletteId;
diff --git a/PR/src/lib/layers/reslist.c b/PR/src/lib/layers/reslist.c
index 4e4010d..3f2105b 100644
--- a/PR/src/lib/layers/reslist.c
+++ b/PR/src/lib/layers/reslist.c
@@ -151,7 +151,7 @@ void resourceListAddInfo(tResourceList* r,tResource* res) {
 		res->path=resInfo->path;
 		res->desc=resInfo->desc;
 		res->name=resInfo->name;
-		res->palette=resInfo->palette;
+		res->paletteId=resInfo->paletteId;
 		res->number=resInfo->number;
 		/* If resource type is invalid or 0, the type will be decided by PR */
 		res->type=resInfo->type;
diff --git a/PR/src/lib/object/object.c b/PR/src/lib/object/object.c
index e7c46bc..7bcfee8 100644
--- a/PR/src/lib/object/object.c
+++ b/PR/src/lib/object/object.c
@@ -44,6 +44,7 @@ tObject getObject(tResource* r, int* error) {
 		*error=PR_RESULT_SUCCESS;
 		o.type=eResTypeNone;
 		o.obj=NULL;
+		return o;
 	}
 
 	o.type=r->type;