git » fp-git.git » commit b45fb54

see diffs

author ecalot
2004-06-20 19:16:55 UTC
committer ecalot
2004-06-20 19:16:55 UTC
parent e244e333707b9f64ad15406dc1a29dc252d7995d

see diffs

FP/src/res/resources.c +9 -9
stuff/data/type +2 -2

diff --git a/FP/src/res/resources.c b/FP/src/res/resources.c
index 29220dc..31c5611 100644
--- a/FP/src/res/resources.c
+++ b/FP/src/res/resources.c
@@ -105,15 +105,15 @@ void res_createFrames(tMemory data,int type,void** returnValue,int number) {
 				number--;
 			}
 			mExpandGraphic(data.array,&image,data.size);
-			/* TODO: the result must be an object created in output module: 
-			 * result=outputLoadBitmap(
-			 *   image.pix,image.widthInBytes*image.height,image.pal,image.height,image.width,
-			 *   (type==RES_TYPE_IMG_TR_RIGHT||type==RES_TYPE_IMG_BL_RIGHT),
-			 *   (type==RES_TYPE_IMG_TR_RIGHT||type==RES_TYPE_IMG_TR_LEFT)
-			 * );
-			 */
-			result=(tMemory*)malloc(sizeof(tMemory)); /* both sides are void* :)  */
-			*result=(tMemory)data;
+			/* TODO: the result must be an object created in output module: */
+			result=(void*)outputLoadBitmap(
+				image.pix,image.widthInBytes*image.height,image.pal,image.height,image.width,
+				(type==RES_TYPE_IMG_TR_RIGHT||type==RES_TYPE_IMG_BL_RIGHT),
+				(type==RES_TYPE_IMG_TR_RIGHT||type==RES_TYPE_IMG_TR_LEFT)
+			);
+			 
+			//result=(tMemory*)malloc(sizeof(tMemory)); /* both sides are void* :)  */
+			//*result=(tMemory)data;
 			printf("res_createFrames: Allocating frame[%d]=? (image type %d)\n",number,type);
 			break;
 		case RES_TYPE_SND_MIDI:
diff --git a/stuff/data/type b/stuff/data/type
index f2840f1..952fb15 100755
--- a/stuff/data/type
+++ b/stuff/data/type
@@ -34,8 +34,8 @@ case "$1" in
 		exit 0
 	;;
 	ren)
-		. $0 del $1
-		. $0 add $2
+		. $0 del $2
+		. $0 add $1
 		exit 0
 	;;
 	*)