git » fp-git.git » commit 5f8c067

added height support in states animation

author ecalot
2005-02-07 01:29:33 UTC
committer ecalot
2005-02-07 01:29:33 UTC
parent 17d36d7bd01d7b33f6b66e7a8ae2eb113a3e3cf0

added height support in states animation

FP/src/conf/awk/states_conf_static.awk +5 -5
FP/src/conf/flags.conf +2 -0
FP/src/conf/states/main.conf +1 -1

diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk
index 4f9ce69..e6339dc 100644
--- a/FP/src/conf/awk/states_conf_static.awk
+++ b/FP/src/conf/awk/states_conf_static.awk
@@ -268,20 +268,20 @@ END {
 		s=match(flags,/([^0-9 +@\$-])/)
 		if (s) d=substr(flags,s,1)
 		if (s&&(d!="#")) {
-			coma2=""
 			flagmask=""
 			while (s) {
-				flagmask=sprintf("%s%sSTATES_FLAG_%s",flagmask,coma2,toupper(d))
+				flagmask=sprintf("%sSTATES_FLAG_%s|",flagmask,toupper(d))
 				flags=substr(flags,s+1,length(flags)-s)
 				s=match(flags,/([^0-9 +@\$-])/)
 				if (s) d=substr(flags,s,1)
 				if (d=="#") s=0
-				coma2="|"
 			}
 		} else {
-			flagmask="0"
+			flagmask=""
 		}
-		printf "%s%d,%s,%d",coma,arrayAnimation[i,"frame"],flagmask,steps
+		if (offxs) flagmask=sprintf("%sSTATES_FLAG_HEIGHTOFFSET|",flagmask)
+		printf "%s%d,%s0,%d",coma,arrayAnimation[i,"frame"],flagmask,steps
+#		if (offxs) printf ",/* h= */%d",offxs
 		if (i%10==9) printf("\\\n\t")
 		coma=","
 	}
diff --git a/FP/src/conf/flags.conf b/FP/src/conf/flags.conf
index 1ae4c5a..46d518a 100644
--- a/FP/src/conf/flags.conf
+++ b/FP/src/conf/flags.conf
@@ -9,3 +9,5 @@ g you hit the guard/kid
 f fall down
 u go up one floor
 t turn
+
+heightoffset internal flag to detect frames with height
diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index 6195980..9d33522 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -38,7 +38,7 @@ normal:
 		next
 			normal
 		animation
-			16-22 $2
+			16-22 $2 @20
 		steps
 			absoluteOnStop  8