diff --git a/data/world1/level41.dat b/data/world1/level41.dat index 41f71c3..cf949ae 100644 --- a/data/world1/level41.dat +++ b/data/world1/level41.dat @@ -7,10 +7,6 @@ monsters 0 7 28 1 35 13 1 2 13 -132 19 17 312 456 312 100 -16 19 16 -15 18 16 -15 20 16 15 14 5 15 7 5 15 24 20 @@ -31,6 +27,10 @@ monsters 15 33 19 15 24 8 15 23 8 +132 19 6 312 442 +15 18 5 +15 20 5 +16 19 5 endmonsters exitdir 1 61,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,61, diff --git a/rc.c b/rc.c index d9f6d80..ba1f20e 100644 --- a/rc.c +++ b/rc.c @@ -1557,7 +1557,7 @@ void checkcollideplatform(sprite_t *s) { if ((s2->x >= (s->x - s->img->w/2 - walkimg->w/2 ) ) && (s2->x <= (s->x + s->img->w/2 + walkimg->w/2)) && (s2->y >= (s->y - s->img->h) ) && (s2->y <= s->y - s->img->h/2)) { /* COLLISION! */ - if (!s2->jumping) { + if ((!s2->jumping) && (!s2->dead)) { s2->y = s->y - s->img->h; s2->onplatform = s; } @@ -6089,7 +6089,7 @@ int dofruiteffect(sprite_t *s) { sprayalpha = 0; return B_TRUE; } else if (s->id == P_CANNONPOWERUP) { - // flyspray + // cannon playfx(FX_POWERUP); sprintf(tempm, "Fusion Cannon"); addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&white,&black,POINTSDELAY, TT_NORM);