author | ecalot
<ecalot> 2005-01-27 19:29:46 UTC |
committer | ecalot
<ecalot> 2005-01-27 19:29:46 UTC |
parent | 161194bf19936bea55591577503649b87908b844 |
FP/src/conf/awk/states_conf_static.awk | +9 | -6 |
FP/src/conf/states/main.conf | +12 | -12 |
diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk index 53f75f8..75621f8 100644 --- a/FP/src/conf/awk/states_conf_static.awk +++ b/FP/src/conf/awk/states_conf_static.awk @@ -259,16 +259,19 @@ END { coma="" for (i=0;i<currentAnimation;i++) { flags=arrayAnimation[i,"flags"] - match(flags,/([^0-9 +-])/,a) - match(flags,/\+[ ]*([^0-9]+)/,b) - match(flags,/\-[ ]*([^0-9]+)/,c) + s=match(flags,/([^0-9 +-])/,a) + match(flags,/[+][ ]*([0-9]+)/,b) + match(flags,/[-][ ]*([0-9]+)/,c) steps=b[1]/1 offxs=c[1]/1 - if (a[1]) { + if (s&&a[1]!="#") { coma2="" flagmask="" - for (j=1;a[j];j++) { - flagmask=sprintf("%s%sSTATES_FLAG_%s",flagmask,coma2,toupper(a[j])) + while (s) { + flagmask=sprintf("%s%sSTATES_FLAG_%s",flagmask,coma2,toupper(a[1])) + flags=substr(flags,s+1,length(flags)-s) + s=match(flags,/([^0-9 +-])/,a) + if (a[1]=="#") s=0 coma2="|" } } else { diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf index b53cf1d..3081e98 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 steps absoluteOnStop 8 @@ -49,9 +49,9 @@ normal: next normal animation - 16-27 4 + 16-27 +4 28 ps - 29-33 p 2 + 29-33 p +2 steps relative 0 @@ -136,11 +136,11 @@ normal: steps relative 0 animation - 134-135 p 1 - 136 5 - 137-139 6 - 140 5 - 141-145 p 1 #total: 32 + 134-135 p +1 + 136 +5 + 137-139 +6 + 140 +5 + 141-145 p +1 #total: 32 action Start running and crashing conditions KeyForward pressed @@ -159,7 +159,7 @@ normal: steps relative 0 animation - 1-4 p 3 + 1-4 p +3 action Turn conditions KeyBack pressed @@ -187,7 +187,7 @@ normal: steps relative 0 animation - 15 f 2 + 15 f +2 action If there aren't more actions then the normal state is kept conditions @@ -237,7 +237,7 @@ running: steps relative 0 animation - 34-44 p 7 + 34-44 p +7 action Keep running and crash @@ -258,7 +258,7 @@ running: steps relative 0 animation - 5-14 p 5 + 5-14 p +5 action Turn conditions KeyBack pressed