From 2c3b50fe8c5a338b436f8174b0b1bc322509816c Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Tue, 23 Dec 2008 01:03:11 +0000 Subject: [PATCH] Fixed behaviour of bad magnet (skull) --- rc.c | 2 +- shared.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rc.c b/rc.c index 6c485fd..5324f79 100644 --- a/rc.c +++ b/rc.c @@ -8541,7 +8541,7 @@ int dofruiteffect(sprite_t *pp, sprite_t *s) { playfx(FX_SKULL); sprintf(tempm, "Repel fruits!"); addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&black,&grey,POINTSDELAY, TT_NORM); - pp->powerup = PW_MAGNET; + pp->powerup = PW_BADMAGNET; return B_TRUE; } else if (s->id == P_ANCHOR) { playfx(FX_MORPH); diff --git a/shared.c b/shared.c index 94e5446..cebaf6b 100644 --- a/shared.c +++ b/shared.c @@ -1151,6 +1151,7 @@ int loadtiletypes(char *filename) { //strcat(imagefile, "/"); //strcat(imagefile, p); + //t->img[frame] = IMG_Load(imagefile); t->img[frame] = IMG_Load(imagefile); if (!t->img[frame]) { printf("cannot load tile image file: '%s'\n",imagefile); @@ -1858,6 +1859,7 @@ int loadimagesets(void) { printf("error rotozooming sprite %d, deadimage %d\n",p,fr); exit(1); } + SDL_SetColorKey(tempimg, SDL_RLEACCEL, 0); imageset[p].img[fr] = SDL_DisplayFormat(tempimg); SDL_FreeSurface(tempimg); }