| author | ecalot
<ecalot> 2004-10-24 16:29:02 UTC |
| committer | ecalot
<ecalot> 2004-10-24 16:29:02 UTC |
| parent | eb0fc3e76c7bc19c0591eebd54dad294a4f35b57 |
| FP/src/Makefile | +6 | -4 |
| FP/src/conf/awk/states_conf_static.awk | +8 | -1 |
diff --git a/FP/src/Makefile b/FP/src/Makefile index e847e36..bff465d 100644 --- a/FP/src/Makefile +++ b/FP/src/Makefile @@ -149,7 +149,8 @@ room.o: ker/room.c include/room.h include/resources.h include/res_conf.h $(CC) -c ker/room.c $(OPTIONS) kid.o: ker/kid.c include/kid.h include/resources.h include/res_conf.h\ - include/states.h include/states_conf.h include/res_conf.h\ + include/states.h include/states_conf.h $(GENERATEDRESHEADERS)\ + $(GENERATEDTILHEADERS) include/res_conf.h\ include/types.h include/tiles.h include/tiles_conf.h $(INFO) Compiling kernel kid object... $(CC) -c ker/kid.c $(OPTIONS) @@ -181,12 +182,13 @@ config.o: res/config.c include/resources.h include/res_conf.h states.o: ker/states.c include/states.h include/states_conf.h\ include/resources.h include/res_conf.h include/types.h\ - include/tiles.h include/tiles_conf.h - $(INFO) compiling kernel states module... + include/tiles.h include/tiles_conf.h $(GENERATEDRESHEADERS)\ + $(GENERATEDSTAHEADERS) $(GENERATEDTILHEADERS) + $(INFO) Compiling kernel states module... $(CC) -c ker/states.c $(OPTIONS) tiles.o: res/tiles.c include/tiles.h include/tiles_conf.h - $(INFO) compiling resource tile classification module... + $(INFO) Compiling resource tile classification module... $(CC) -c res/tiles.c $(OPTIONS) diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk index 4c72dba..53bbd44 100644 --- a/FP/src/conf/awk/states_conf_static.awk +++ b/FP/src/conf/awk/states_conf_static.awk @@ -65,17 +65,24 @@ BEGIN { moveType=tolower($1) # conditions option } else if (listType == "conditions") { + #ignore "none" if ($1=="none") next + #if there is a new group add a "break" if (oldType != listType ) { oldType=listType currentCondition++ printf("\t{esLast,0}, /* condition number %d */\\\n",currentCondition) conditions=currentCondition+1 } + #add condition currentCondition++ if ($2!=sprintf("%d",$2)) { if (1) { #defines[$2]) { - result=sprintf("STATES_COND_%s /* %d */",$2,0) #defines[$2]) + if ($1~/^Map/) { + result=sprintf("TG_%s",$2,0) + } else { + result=sprintf("STATES_COND_%s",$2,0) + } } else { if ($2) { printf("Parsing error in states.conf: Condition modifier '%s' not recognized on uncommented line %d.\n",$2,NR)>"/dev/stderr"