| author | ecalot
<ecalot> 2004-10-27 06:10:18 UTC |
| committer | ecalot
<ecalot> 2004-10-27 06:10:18 UTC |
| parent | ac5eca77be5e4630370e2136566d9c555b3e96fa |
| FP/src/Makefile | +5 | -0 |
| FP/src/conf/states/main.conf | +31 | -0 |
| FP/src/conf/tiles.conf | +4 | -2 |
| FP/src/ker/states.c | +1 | -1 |
diff --git a/FP/src/Makefile b/FP/src/Makefile index bff465d..0587764 100644 --- a/FP/src/Makefile +++ b/FP/src/Makefile @@ -118,6 +118,11 @@ downloadmore: $(INFO) Downloading extra files... @wget http://fp.princed.com.ar/freeprince2.script -O - -nv 2>/dev/null|tar xjC bin +run: + @cd bin;./freeprince;cd .. + +it: $(EXEFILE) run + ################ # Source files # ################ diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf index 792c441..7a2db5f 100644 --- a/FP/src/conf/states/main.conf +++ b/FP/src/conf/states/main.conf @@ -41,6 +41,37 @@ normal: 29-33 p steps relative 20 + action Pass level + conditions + KeyUp pressed + MapOn exitdoor + next + normal #exit pass + animation + 53-64 + steps + relative 0 + action Jump up with free space up + conditions + KeyUp pressed + MapUp space + next + normal + animation + 81-93 + 96-99 + steps + relative 0 + action Jump up with cieling + conditions + KeyUp pressed + next + normal + animation + 81-92 + 97-99 + steps + relative 0 action Start walking conditions KeyShift pressed diff --git a/FP/src/conf/tiles.conf b/FP/src/conf/tiles.conf index fdc7849..d7d8583 100644 --- a/FP/src/conf/tiles.conf +++ b/FP/src/conf/tiles.conf @@ -29,7 +29,7 @@ # tile EMPTY 0 free -dangerous +dangerous space tile FLOOR 1 free walkable tile SPIKES 2 spike @@ -51,9 +51,11 @@ tile MIRROR 13 none tile DEBRIS 14 none tile BTN_RAISE 15 event tile EXIT_LEFT 16 none -gates +gates tile EXIT_RIGHT 17 none +exitdoor + tile CHOPPER 18 chomp tile TORCH 19 none tile WALL 20 wall diff --git a/FP/src/ker/states.c b/FP/src/ker/states.c index fd0edda..0bd534e 100644 --- a/FP/src/ker/states.c +++ b/FP/src/ker/states.c @@ -12,7 +12,7 @@ void debugShowFlag(short optionflag) { printf("\n"); } -#define STATES_STEPS_PER_TILE 32 +#define STATES_STEPS_PER_TILE 10 /* Private static state graph */ static tsAction statesActionList[]=STATES_ACTIONS; static short statesAnimationList[]=STATES_ANIMATIONS;