git » fp-git.git » commit 7d908c5

diff --git a/stuff/data/makedat b/stuff/data/makedat
index 1b96955..f2e3e89 100755
--- a/stuff/data/makedat
+++ b/stuff/data/makedat
@@ -64,8 +64,26 @@ then
 		fi
 		
 		#convert def files to proc files
-		sed -e "2,1s/.*/$ID/g" $FDEF > $FPROC
-		
+		#process images
+		grep -q -e '^IMG$' $FDEF
+		if [ $? == 0 ]
+		then
+			sed -e '2,$d' $FDEF > $FPROC
+			PAL=`sed -e '1,2d' -e '4,$d' $FDEF`
+			echo -n -e "$ID\n$PAL\n" >> $FPROC
+			sed -e '1,3d' $FDEF|while read frameline
+			do
+				frame=`echo "$frameline" | sed -e 's/^\([0-9]*\).*$/\1/g'`
+				#bottom=`echo "$frameline" | sed -e 's/^.* [Bb]:\([0-9]*\).*$/\1/g' -e "s/^$frameline\$/0/g"`
+				#left=`echo "$frameline" | sed -e 's/^.* [Ll]:\([0-9]*\).*$/\1/g' -e "s/^$frameline\$/0/g"`
+				#right=`echo "$frameline" | sed -e 's/^.* [Rr]:\([0-9]*\).*$/\1/g' -e "s/^$frameline\$/0/g"`
+				#echo -n -e "$frame\n$bottom\n$left\n$right\n">>$FPROC
+				echo -n -e "$frame\n">>$FPROC
+			done
+		else
+			sed -e "2,1s/.*/$ID/g" $FDEF > $FPROC
+		fi
+			
 		#convert proc files to index files
 		bin/makeindex $FPROC $FINDEX
 	
@@ -106,3 +124,4 @@ then
 	rm error_log
 fi
 
+
diff --git a/stuff/data/result/types.h b/stuff/data/result/types.h
index 724faa7..f766930 100644
--- a/stuff/data/result/types.h
+++ b/stuff/data/result/types.h
@@ -1,10 +1,7 @@
 /* Defined types for freeprince resources*/
 
-#define RES_TYPE_IMG_TR_LEFT 0
-#define RES_TYPE_IMG_TR_RIGHT 1
-#define RES_TYPE_IMG_BL_LEFT 2
-#define RES_TYPE_IMG_BL_RIGHT 3
+#define RES_TYPE_IMG 0
+#define RES_TYPE_IMG_PALETTED 1
 #define RES_TYPE_SND_MIDI 4
 #define RES_TYPE_SND_WAVE 5
-#define RES_TYPE_IMG_PALETTED 7
 #define RES_TYPE_LVL 6