From c1a0cbb105c022d8d106b9bca86b81a5cf93a41d Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Sun, 14 Dec 2008 02:29:07 +0000 Subject: [PATCH] Modified tampoline behaviour - you now bounce automatically --- data/levels/level99.dat | 6 +++--- rc.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/levels/level99.dat b/data/levels/level99.dat index a0f388b..7b3b566 100644 --- a/data/levels/level99.dat +++ b/data/levels/level99.dat @@ -31,9 +31,9 @@ exitdir 1 4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4, 4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4, 4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4, -4,0,0,0,0,0,0,0,0,4,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,4,0,0,0,0,0,4, -4,0,0,0,0,0,0,0,0,4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,0,0,0,0,0,4, -4,0,0,0,1,1,1,1,1,4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,1,1,1,1,1,4, +4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4, +4,0,0,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,17,0,0,0,0,0,0,0,4, +4,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4, 4,0,0,0,0,0,0,0,0,4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,1,1,1,1,1,4, 4,0,0,0,0,0,0,0,0,4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,0,0,0,0,0,4, 4,0,0,0,0,0,0,0,0,4,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,4,0,0,0,0,0,4, diff --git a/rc.c b/rc.c index df2dc2b..6ca0314 100644 --- a/rc.c +++ b/rc.c @@ -6604,7 +6604,11 @@ void dogravity(sprite_t *s) { // if we were on a trampoline and are now not, it releases */ tt = gettileat(s->x,s->y,&tilex,&tiley); if (s->ontramp) { - if (s->trampy != tiley) { + if (s->trampy == tiley) { + // you jump automatically! + jump(s, s->xs / getspeed(s)); + } else { + //if (s->trampy != tiley) { // change tile type if (s->tramplayer == 1) { curlevel->map[s->trampy * LEVELW + s->trampx] = getuniq(T_TRAMPUP);