diff --git a/include/basic.h b/include/basic.h index 3b2b4e2..bdbf6e2 100644 --- a/include/basic.h +++ b/include/basic.h @@ -1,4 +1,4 @@ -/* $Id: basic.h,v 1.36 2006/08/15 14:12:19 patty21 Exp $ */ +/* $Id: basic.h,v 1.37 2009/10/10 09:43:54 stpohle Exp $ */ /* basic types which we need everywhere */ #ifndef _BC_BASIC_H_ @@ -82,7 +82,7 @@ #define AUTOSTART 20 /* server autostart */ -#define MW_IS_GFX_SELECT(__gfx_nr,__result) for (__result = (MAX_PLAYERS-1); (__result >= 0) && (players[__result].gfx_nr != __gfx_nr); __result--); +#define MW_IS_GFX_SELECT(__gfx_nr,__result) for (__result = (MAX_PLAYERS-1); (__result >= 0) && (players[__result].gfx_nr != __gfx_nr); __result--) d_printf ("__result:%d, gfx:%d __gfx:%d\n", __result, players[__result].gfx_nr, __gfx_nr); #define CUTINT(__x) (__x-floorf(__x)) // cut the integer part off #define postofield(__x) ((int)(rintf(__x))) // position to int with rounding diff --git a/src/gfx.c b/src/gfx.c index 21f5209..24d2e66 100644 --- a/src/gfx.c +++ b/src/gfx.c @@ -1,4 +1,4 @@ -/* $Id: gfx.c,v 1.41 2005/07/06 13:11:55 stpohle Exp $ */ +/* $Id: gfx.c,v 1.42 2009/10/10 09:43:55 stpohle Exp $ */ /* gfx.c */ #include "bomberclone.h" @@ -69,7 +69,7 @@ gfx_load_players (int sx, int sy) tmpimage1 = scale_image (tmpimage, gfx.players[i].ani.w * 4, gfx.players[i].ani.frames * gfx.players[i].ani.h); getRGBpixel (tmpimage1, 0, 0, &r, &g, &b); SDL_SetColorKey (tmpimage1, SDL_SRCCOLORKEY, SDL_MapRGB (tmpimage1->format, r, g, b)); - gfx.players[i].ani.image = SDL_DisplayFormat (tmpimage1); + gfx.players[i].ani.image = SDL_DisplayFormat (tmpimage1); SDL_FreeSurface (tmpimage1); /* calculate the numbers of images for the animation */ @@ -100,8 +100,8 @@ gfx_load_players (int sx, int sy) sprintf (filename, "%s/player/playersick.png", bman.datapath); tmpimage = IMG_Load (filename); if (tmpimage == NULL) { - printf ("Can't load image: %s\n", SDL_GetError ()); - exit (1); + printf ("Can't load image: %s\n", SDL_GetError ()); + exit (1); } gfx.ill.frames = tmpimage->h / (2 * GFX_IMGSIZE); tmpimage1 = scale_image (tmpimage, (2 * sx * tmpimage->w) / (2 * GFX_IMGSIZE), gfx.ill.frames * (2 * sy)); @@ -115,8 +115,8 @@ gfx_load_players (int sx, int sy) sprintf (filename, "%s/player/respawn.png", bman.datapath); tmpimage = IMG_Load (filename); if (tmpimage == NULL) { - printf ("Can't load image: %s\n", SDL_GetError ()); - exit (1); + printf ("Can't load image: %s\n", SDL_GetError ()); + exit (1); } gfx.respawn.frames = tmpimage->h / (2 * GFX_IMGSIZE); gfx.respawn.image = scale_image (tmpimage, (2 * sx * tmpimage->w) / (2 * GFX_IMGSIZE), gfx.respawn.frames * (2 * sy));