git » fp-git.git » commit a8e0b6d

fixed state passing bug

author ecalot
2004-10-23 07:07:19 UTC
committer ecalot
2004-10-23 07:07:19 UTC
parent bd1dd2446c691ca7aa5feb81c6d1573bedf1d8f0

fixed state passing bug

FP/src/conf/awk/states_conf_static.awk +2 -1
FP/src/conf/states/main.conf +2 -1
FP/src/ker/states.c +1 -0

diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk
index 2a1650f..a68b67d 100644
--- a/FP/src/conf/awk/states_conf_static.awk
+++ b/FP/src/conf/awk/states_conf_static.awk
@@ -153,9 +153,10 @@ BEGIN {
 #no tabs (states)
 /^[^\t# ].*$/ {
 		listType=""
+		if ($1 ~ /:$/ ) $1=substr($1,1,length($1)-1)
 		priorState=currentState #TODO fix that!!!
 		currentState=tolower($1)
-		stateList[currentState]=currentAction
+		stateList[currentState]=currentAction+1
 }
 
 END {
diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index be87ba0..3aacc3b 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -123,7 +123,8 @@ running:
 		steps
 			relative 15
 		animation
-			55-68 p
+			65-68 p
+			49-52 p
 
 oldnormal:
 	action                     Start walking when it is near a falling
diff --git a/FP/src/ker/states.c b/FP/src/ker/states.c
index 8b108f7..1e75b6d 100644
--- a/FP/src/ker/states.c
+++ b/FP/src/ker/states.c
@@ -154,6 +154,7 @@ short stateUpdate(tKey* key, tKid* kid,tRoom* room) {
 		stateGetAnimation(action,current);
 			/* Remember the state where we are now */
 		current->currentState=statesActionList[action].nextStateId;
+		printf("NEW STATE: action=%d next=%d\n",action,current->currentState);
 			/* Move the kid (turn+traslate) */
 		if (kid->direction==DIR_LEFT) {
 			current->step=-current->step;