git » fp-git.git » commit a9da9c1

several bugfixes

author ecalot
2004-10-24 04:43:51 UTC
committer ecalot
2004-10-24 04:43:51 UTC
parent 65cb8c142ae6e50fc0568101d51edb39432ef335

several bugfixes

FP/src/conf/awk/states_conf_static.awk +3 -3
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 bcba3d1..4119445 100644
--- a/FP/src/conf/awk/states_conf_static.awk
+++ b/FP/src/conf/awk/states_conf_static.awk
@@ -30,7 +30,7 @@
 
 BEGIN {
 	currentCondition=-1
-	currentAction=0
+	currentAction=-1
 	printf("#define STATES_MOVETYPES_RELATIVE 0\n")
 	printf("#define STATES_MOVETYPES_ABSOLUTEFORWARD 1\n\n")
 	printf("#define STATES_MOVETYPES_RELATIVETURN 2\n\n")
@@ -151,12 +151,12 @@ BEGIN {
 		actionArray[currentAction,"moveType"]=moveType
 		actionArray[currentAction,"moveOffset"]=moveOffset
 		actionArray[currentAction,"lastComma"]=","
-		currentAction++
 		currentState=""
 	} else {
 		first=1
 	}
 
+	currentAction++
 	startAnimation=currentAnimation
 	listType=""
 	conditions=0
@@ -176,7 +176,7 @@ BEGIN {
 		} else {
 			currentState=tolower($1)
 		}
-		stateList[tolower($1)]=currentAction
+		stateList[tolower($1)]=currentAction+1
 }
 
 END {
diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index b2ae4fe..de61e35 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -29,6 +29,18 @@
 #
 
 normal:
+	action            Jump
+		conditions
+			KeyUp                  pressed
+			KeyForward             pressed
+		next
+			normal
+		animation
+			16-27 
+			28 ps
+			29-33 p
+		steps
+			relative 20
 	action            Start walking
 		conditions
 			KeyShift               pressed
@@ -59,18 +71,6 @@ normal:
 			relativeTurn 0
 		animation
 			45-52 p
-	action            Jump
-		conditions
-			KeyUp                  pressed
-			KeyForward             pressed
-		next
-			normal
-		animation
-			16-27 
-			28 ps
-			29-33 p
-		steps
-			relative 20
 	action            If there aren't more actions then the normal state is kept
 		conditions
 			none