diff --git a/src/basic.h b/src/basic.h index 1c978e2..f4d1446 100644 --- a/src/basic.h +++ b/src/basic.h @@ -1,4 +1,4 @@ -/* $Id: basic.h,v 1.45 2003/07/27 20:55:14 stpohle Exp $ */ +/* $Id: basic.h,v 1.46 2003/07/27 21:09:57 stpohle Exp $ */ /* basic types which we need everywhere */ #ifndef _BC_BASIC_H_ @@ -80,12 +80,6 @@ #define MENU_BG_SHADE_DARK -64 #define MENU_BG_SHADE_BRIGHT 64 -#define FIELDECHECK_TIMEOUT 500 /* timeout for the field check function */ -#define FIELDHURRYWARN 2000 /* hurry warning */ -#define FIELDHURRYDROPTO 50 /* timeout when to put in some special items */ -#define FIELDHURRYSIZE 5 /* timeout when to put in some special items */ -#define FIELDHURRYSIZEMIN 15 /* min size for the field */ - #define MW_IS_GFX_SELECT(__gfx_nr,__result) for (__result = (MAX_PLAYERS-1); (bman.players[__result].gfx_nr != __gfx_nr) && (__result >= 0); __result--); enum _networkflags { diff --git a/src/field.c b/src/field.c index 04239fa..f8950ca 100644 --- a/src/field.c +++ b/src/field.c @@ -1,8 +1,14 @@ -/* $Id: field.c,v 1.41 2003/07/27 20:53:21 stpohle Exp $ */ +/* $Id: field.c,v 1.42 2003/07/27 21:09:57 stpohle Exp $ */ /* field.c - procedures which are needed to control the field */ #include "bomberclone.h" +#define FIELDECHECK_TIMEOUT 500 /* timeout for the field check function */ +#define FIELDHURRYWARN 500 /* hurry warning */ +#define FIELDHURRYDROPTO 50 /* timeout when to put in some special items */ +#define FIELDHURRYSIZE 25 /* timeout when to put in some special items */ +#define FIELDHURRYSIZEMIN 5 /* min size for the field */ + static _point fieldani[MAX_FIELDANIMATION]; static _point stonelist[MAX_STONESTODRAW]; // keep all stones to draw @@ -316,7 +322,7 @@ void field_loop () { /* single game or multiplayer master, so check field state */ - if (GT_MP_PTPM || bman.gametype == GT_single) { + if ((GT_MP_PTPM || bman.gametype == GT_single) && bman.state == GS_running) { /* timeout for rechecking every 5 secs the field */ if (map.state == MS_normal && map.map_selection == MAPS_randgen @@ -397,7 +403,7 @@ field_hurrysize () _point old; if (fieldhurry_to-- <= 0 || fieldhurry_to > FIELDHURRYSIZE) { - fieldhurry_to = FIELDHURRYSIZE; + fieldhurry_to = FIELDHURRYSIZE; if (fieldhurrypos.x == 0) { fieldhurrypos.x = fieldhurrypos.y = 1; diff --git a/src/game.c b/src/game.c index 695e127..7d6c2dc 100644 --- a/src/game.c +++ b/src/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.49 2003/07/27 20:53:21 stpohle Exp $ +/* $Id: game.c,v 1.50 2003/07/27 21:09:57 stpohle Exp $ game.c - procedures for the game. */ #include @@ -107,7 +107,7 @@ game_draw_info () } if (chat.visible == 0 && GT_MP_PTP) - chat_show (4, 3 * 16, gfx.res.x - 4, gfx.offset.y); + chat_show (4, 4.5*16, gfx.res.x - 4, gfx.offset.y); }; diff --git a/src/map.c b/src/map.c index b158ec8..dd49f63 100644 --- a/src/map.c +++ b/src/map.c @@ -1,4 +1,4 @@ -/* $Id: map.c,v 1.5 2003/07/27 20:53:21 stpohle Exp $ */ +/* $Id: map.c,v 1.6 2003/07/27 21:09:57 stpohle Exp $ */ /* map handling, like generate and load maps. */ #include "bomberclone.h" @@ -109,7 +109,7 @@ map_genrandom () if ((s_random (256) & 3) == 0) map.field[x][y].type = FT_nothing; else - map.field[x][y].type = FT_nothing; + map.field[x][y].type = FT_stone; } for (d = 0; d < 4; d++)