steffen
/
bomberclone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gfx for the powerups changed.. as soon someone makes a good powerup.bmp with animation we will see it.. :o)

Browse Source
origin
stpohle 23 years ago
parent 405867ec5e
commit c2563f2a0e
2 changed files with 217 additions and 182 deletions
Show Stats Download Patch File Download Diff File

145
src/field.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: field.c,v 1.21 2003/05/18 14:06:29 patty21 Exp $ */ /* $Id: field.c,v 1.22 2003/06/01 22:06:30 stpohle Exp $ */
/* field.c - procedures which are needed to control the field */ /* field.c - procedures which are needed to control the field */
#include <stdlib.h> #include <stdlib.h>
@ -13,7 +13,7 @@ draw_stone (int x, int y)
_field *stone = &bman.field[x][y]; _field *stone = &bman.field[x][y];
SDL_Rect dest, SDL_Rect dest,
src; src;
SDL_Surface *srcimg; SDL_Surface *srcimg = NULL;
int i, int i,
d; d;
@ -25,43 +25,66 @@ draw_stone (int x, int y)
src.x = 0; src.x = 0;
if (stone->frame == 0 || stone->type != FT_stone) { /* draw background if we have a stone, block or nothing */
srcimg = gfx.field[stone->type].image; if (stone->type <= FT_block) {
src.y = 0; SDL_Rect srcbg;
srcbg.w = dest.w;
srcbg.h = dest.h;
srcbg.x = (x % gfx.field[FT_nothing].frames) * gfx.block.x;
srcbg.y = (y % gfx.field[FT_nothing].frames) * gfx.block.y;
SDL_BlitSurface (gfx.field[FT_nothing].image, &srcbg, gfx.screen, &dest);
} }
else {
if (stone->frameto == 0) { /* animate the stone if needed only for exploding stone */
if (stone->type == FT_stone && stone->frame > 0) {
if (stone->frameto == 0)
if (stone->frame < gfx.field[stone->type].frames) { if (stone->frame < gfx.field[stone->type].frames) {
stone->frame++; stone->frame++;
stone->frameto = ANI_STONETIMEOUT; stone->frameto = ANI_STONETIMEOUT;
} }
}
if (stone->frameto > 0) if (stone->frameto > 0)
stone->frameto--; stone->frameto--;
if (stone->frame < gfx.field[stone->type].frames) {
if (stone->frame < gfx.field[FT_stone].frames) {
src.y = stone->frame * gfx.block.y; src.y = stone->frame * gfx.block.y;
srcimg = gfx.field[stone->type].image; srcimg = gfx.field[FT_stone].image;
} }
else { else {
src.y = 0; src.y = 0;
srcimg = gfx.field[FT_nothing].image; srcimg = gfx.field[FT_nothing].image;
} }
}
else if (stone->type == FT_stone || stone->type == FT_block) {
src.y = 0;
srcimg = gfx.field[stone->type].image;
} }
if (stone->frame > 0 || stone->type == FT_nothing) { /* some powerup so we need to animate this too */
SDL_Rect srcbg; else if (stone->type >= FT_death) {
if (stone->frameto-- <= 0 || stone->frameto > ANI_STONETIMEOUT) {
stone->frameto = ANI_STONETIMEOUT;
stone->frame++;
}
srcbg.w = dest.w; if (stone->frame >= gfx.powerup.frames)
srcbg.h = dest.h; stone->frame = 0;
srcbg.x = (x % gfx.field[FT_nothing].frames) * gfx.block.x;
srcbg.y = (y % gfx.field[FT_nothing].frames) * gfx.block.y;
SDL_BlitSurface (gfx.field[FT_nothing].image, &srcbg, gfx.screen, &dest); srcimg = gfx.powerup.image;
src.y = stone->frame * gfx.block.y;
} }
if (stone->type != FT_nothing) if (srcimg != NULL)
SDL_BlitSurface (srcimg, &src, gfx.screen, &dest);
if (stone->type >= FT_death) { /* draw now the powerup itself */
srcimg = gfx.field[stone->type].image;
src.y = 0;
SDL_BlitSurface (srcimg, &src, gfx.screen, &dest); SDL_BlitSurface (srcimg, &src, gfx.screen, &dest);
}
// draw explosions if there is any // draw explosions if there is any
for (d = 0, i = 0; d < 4; d++) for (d = 0, i = 0; d < 4; d++)
@ -69,6 +92,7 @@ draw_stone (int x, int y)
i = 1; // mark that there is already an explosion i = 1; // mark that there is already an explosion
draw_fire (x, y, d, -1); draw_fire (x, y, d, -1);
} }
return; return;
}; };
@ -137,17 +161,26 @@ field_load (FILE * map)
/* darw the border so we know everything is right */ /* darw the border so we know everything is right */
for (i = 0; i < bman.fieldsize.x; i++) for (i = 0; i < bman.fieldsize.x; i++)
bman.field[i][0].type = bman.field[i][bman.fieldsize.y-1].type = FT_block; bman.field[i][0].type = bman.field[i][bman.fieldsize.y - 1].type = FT_block;
for (i = 0; i < bman.fieldsize.y; i++) for (i = 0; i < bman.fieldsize.y; i++)
bman.field[0][i].type = bman.field[bman.fieldsize.x-1][i].type = FT_block; bman.field[0][i].type = bman.field[bman.fieldsize.x - 1][i].type = FT_block;
} }
/* will set the playerposition but in a way that we won't start on a block */ /* will set the playerposition but in a way that we won't start on a block */
/* i am just too lazy to write this all again and again */ /* i am just too lazy to write this all again and again */
#define PLX bman.players[i].pos.x #define PLX bman.players[i].pos.x
#define PLY bman.players[i].pos.y #define PLY bman.players[i].pos.y
void field_set_playerposition (int usermap) { void
int p, dist, i,j , mx, my, dx = 0, dy = 0; field_set_playerposition (int usermap)
{
int p,
dist,
i,
j,
mx,
my,
dx = 0,
dy = 0;
char txt[255]; char txt[255];
p = 50; p = 50;
@ -165,14 +198,17 @@ void field_set_playerposition (int usermap) {
for (dx = 10, dy = 10, j = 0; (j < i && j < MAX_PLAYERS && (dx > 1 || dy > 1)); j++) { /* is ther any other player */ for (dx = 10, dy = 10, j = 0; (j < i && j < MAX_PLAYERS && (dx > 1 || dy > 1)); j++) { /* is ther any other player */
dx = PLX - bman.players[j].pos.x; dx = PLX - bman.players[j].pos.x;
if (dx < 0) dx = - dx; if (dx < 0)
dx = -dx;
dy = PLY - bman.players[j].pos.y; dy = PLY - bman.players[j].pos.y;
if (dy < 0) dy = - dy; if (dy < 0)
dy = -dy;
} }
/* check if there is no block */ /* check if there is no block */
if ((dx > 1 || dy > 1) && ((bman.field[PLX][PLY].type != FT_block && maxloop > 100) || if ((dx > 1 || dy > 1)
bman.field[PLX][PLY].type == FT_nothing)) { && ((bman.field[PLX][PLY].type != FT_block && maxloop > 100)
|| bman.field[PLX][PLY].type == FT_nothing)) {
/* get (up or down) dx and (left or right) dy */ /* get (up or down) dx and (left or right) dy */
dx = s_random (2); dx = s_random (2);
if (dx == 0) if (dx == 0)
@ -182,18 +218,18 @@ void field_set_playerposition (int usermap) {
dy = -1; dy = -1;
/* first check if there is and free place for us */ /* first check if there is and free place for us */
if (!((bman.field[PLX+dx][PLY].type != FT_block && maxloop > 100) || if (!((bman.field[PLX + dx][PLY].type != FT_block && maxloop > 100) ||
bman.field[PLX+dx][PLY].type == FT_nothing)) bman.field[PLX + dx][PLY].type == FT_nothing))
dx = -dx; dx = -dx;
if (!((bman.field[PLX+dx][PLY].type != FT_block && maxloop > 100) || if (!((bman.field[PLX + dx][PLY].type != FT_block && maxloop > 100) ||
bman.field[PLX+dx][PLY].type == FT_nothing)) bman.field[PLX + dx][PLY].type == FT_nothing))
PLX = -1; PLX = -1;
if (!((bman.field[PLX][PLY+dy].type != FT_block && maxloop > 100) || if (!((bman.field[PLX][PLY + dy].type != FT_block && maxloop > 100) ||
bman.field[PLX][PLY+dy].type == FT_nothing)) bman.field[PLX][PLY + dy].type == FT_nothing))
dy = -dy; dy = -dy;
if (!((bman.field[PLX][PLY+dy].type != FT_block && maxloop > 100) || if (!((bman.field[PLX][PLY + dy].type != FT_block && maxloop > 100) ||
bman.field[PLX][PLY+dy].type == FT_nothing)) bman.field[PLX][PLY + dy].type == FT_nothing))
PLY = -1; PLY = -1;
} }
else { else {
@ -204,16 +240,16 @@ void field_set_playerposition (int usermap) {
/* make some space */ /* make some space */
if (PLX != -1 && PLY != -1) { if (PLX != -1 && PLY != -1) {
bman.field[PLX][PLY].type = FT_nothing; bman.field[PLX][PLY].type = FT_nothing;
bman.field[PLX+dx][PLY].type = FT_nothing; bman.field[PLX + dx][PLY].type = FT_nothing;
bman.field[PLX][PLY+dy].type = FT_nothing; bman.field[PLX][PLY + dy].type = FT_nothing;
} }
} }
} }
if (PLX == -1 || PLY == -1) { if (PLX == -1 || PLY == -1) {
/* we could not set all fields or we don't run on a usermap */ /* we could not set all fields or we don't run on a usermap */
if (usermap) { if (usermap) {
sprintf (txt,"Not all players could be set (Pl:%d)", i); sprintf (txt, "Not all players could be set (Pl:%d)", i);
menu_displaymessage ("MAP - ERROR",txt); menu_displaymessage ("MAP - ERROR", txt);
} }
/* now there will be some fields deleted */ /* now there will be some fields deleted */
@ -225,14 +261,14 @@ void field_set_playerposition (int usermap) {
dx = s_random (4); // bit 1 = up/down bit 2 = left/right dx = s_random (4); // bit 1 = up/down bit 2 = left/right
/* up and down */ /* up and down */
if (((dx & 1) == 0 && PLX > 1) || PLX >= bman.fieldsize.x - 2) if (((dx & 1) == 0 && PLX > 1) || PLX >= bman.fieldsize.x - 2)
bman.field[PLX-1][PLY].type = FT_nothing; bman.field[PLX - 1][PLY].type = FT_nothing;
else else
bman.field[PLX+1][PLY].type = FT_nothing; bman.field[PLX + 1][PLY].type = FT_nothing;
/* left and right */ /* left and right */
if (((dx & 2) == 0 && PLY > 1) || PLY >= bman.fieldsize.y - 2) if (((dx & 2) == 0 && PLY > 1) || PLY >= bman.fieldsize.y - 2)
bman.field[PLX][PLY-1].type = FT_nothing; bman.field[PLX][PLY - 1].type = FT_nothing;
else else
bman.field[PLX][PLY+1].type = FT_nothing; bman.field[PLX][PLY + 1].type = FT_nothing;
} }
mx = my = 100; mx = my = 100;
for (j = 0; j <= i; j++) { /* search smalest distance */ for (j = 0; j <= i; j++) { /* search smalest distance */
@ -261,13 +297,14 @@ void field_set_playerposition (int usermap) {
PLY = PLY << 8; PLY = PLY << 8;
} }
}; };
#undef PLX #undef PLX
#undef PLY #undef PLY
// clear field and send this to all netplayers // clear field and send this to all netplayers
void void
field_clear(int x, int y) field_clear (int x, int y)
{ {
bman.field[x][y].type = FT_nothing; bman.field[x][y].type = FT_nothing;
if (bman.gametype != GT_single) if (bman.gametype != GT_single)
@ -275,9 +312,9 @@ field_clear(int x, int y)
} }
void void
field_update(int x, int y) field_update (int x, int y)
{ {
gfx_AddUpdateRect (x * gfx.block.x + gfx.offset.x, y * gfx.block.y + gfx.offset.y, gfx_AddUpdateRect (x * gfx.block.x + gfx.offset.x, y * gfx.block.y + gfx.offset.y,
gfx.block.x, gfx.block.y); gfx.block.x, gfx.block.y);
} }
@ -285,16 +322,18 @@ gfx_AddUpdateRect (x * gfx.block.x + gfx.offset.x, y * gfx.block.y + gfx.offset.
// put items into the field // put items into the field
void void
field_fillitems (int fieldtype, int num) field_fillitems (int fieldtype, int num)
{ {
int nb_try=100,d,x,y; int nb_try = 100,
d,
x,
y;
/* this is the item factor we multiply it with this so we know /* this is the item factor we multiply it with this so we know
how much items we want in the game */ how much items we want in the game */
float fkt = ((float)(bman.fieldsize.x * bman.fieldsize.y))/(25.0 * 17.0); float fkt = ((float) (bman.fieldsize.x * bman.fieldsize.y)) / (25.0 * 17.0);
/* put the row special in the field */ /* put the row special in the field */
for (d = 0; d < num * fkt; d++) { for (d = 0; d < num * fkt; d++) {
x=y=0; x = y = 0;
while (bman.field[x][y].type != FT_stone || bman.field[x][y].special != FT_nothing) { while (bman.field[x][y].type != FT_stone || bman.field[x][y].special != FT_nothing) {
x = ((float) rand () / (float) RAND_MAX) * (bman.fieldsize.x - 1); x = ((float) rand () / (float) RAND_MAX) * (bman.fieldsize.x - 1);
y = ((float) rand () / (float) RAND_MAX) * (bman.fieldsize.y - 1); y = ((float) rand () / (float) RAND_MAX) * (bman.fieldsize.y - 1);
@ -319,8 +358,7 @@ field_new (char *filename)
d; d;
FILE *fmap; FILE *fmap;
if(filename) if (filename) {
{
fmap = fopen (filename, "r"); fmap = fopen (filename, "r");
/* if we can't open the given filename for any reason, reverting /* if we can't open the given filename for any reason, reverting
@ -328,8 +366,7 @@ field_new (char *filename)
if (fmap) if (fmap)
field_load (fmap); field_load (fmap);
} }
else else {
{
fmap = NULL; fmap = NULL;
} }
@ -397,5 +434,3 @@ field_new (char *filename)
/* put the kick special in the field */ /* put the kick special in the field */
field_fillitems (FT_sp_kick, GAME_SPECIAL_ITEMSKICK); field_fillitems (FT_sp_kick, GAME_SPECIAL_ITEMSKICK);
} }

2
src/gfx.c
Unescape View File

@ -868,7 +868,7 @@ gfx_load_tileset (char *tilesetname)
gfx.powerup.frames = tmpimage->h / GFX_IMGSIZE; gfx.powerup.frames = tmpimage->h / GFX_IMGSIZE;
tmpimage1 = tmpimage1 =
scale_image (tmpimage, (tmpimage->w / GFX_IMGSIZE) * gfx.block.x, scale_image (tmpimage, (tmpimage->w / GFX_IMGSIZE) * gfx.block.x,
gfx.bomb.frames * gfx.block.y); gfx.powerup.frames * gfx.block.y);
SDL_SetColorKey (tmpimage1, SDL_SRCCOLORKEY, SDL_MapRGB (tmpimage1->format, 255, 0, 255)); SDL_SetColorKey (tmpimage1, SDL_SRCCOLORKEY, SDL_MapRGB (tmpimage1->format, 255, 0, 255));
gfx.powerup.image = SDL_DisplayFormat (tmpimage1); gfx.powerup.image = SDL_DisplayFormat (tmpimage1);
SDL_FreeSurface (tmpimage); SDL_FreeSurface (tmpimage);

Write Preview
Loading…
Cancel
Save