diff --git a/src/game.c b/src/game.c index c7a3d18..054d46e 100644 --- a/src/game.c +++ b/src/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.47 2003/07/27 19:30:06 stpohle Exp $ +/* $Id: game.c,v 1.48 2003/07/27 20:16:58 stpohle Exp $ game.c - procedures for the game. */ #include @@ -326,12 +326,19 @@ void game_showresult () { font_draw (x, y, text, 2); y += font[2].size.x + 8; - strcpy (text, "Hit [CTRL], [RETURN] or [STRG]"); + strcpy (text, "[CTRL],[RETURN] or [STRG] for another game"); x = (gfx.res.x - (font[1].size.x * strlen (text)) - 64) / 2; - font_setcolor (128, 128, 0, 1); - font_drawbold (x, gfx.res.y - font[1].size.y - 2, text, 1, 1); - font_setcolor (255, 255, 128, 1); - font_draw (x, gfx.res.y - font[1].size.y - 2, text, 1); + font_setcolor (128, 128, 0, 0); + font_drawbold (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0, 2); + font_setcolor (255, 255, 128, 0); + font_draw (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0); + + strcpy (text, "or [ESC] to leave the game."); + x = (gfx.res.x - (font[1].size.x * strlen (text)) - 64) / 2; + font_setcolor (128, 128, 0, 0); + font_drawbold (x, gfx.res.y - font[0].size.y - 2, text, 0, 2); + font_setcolor (255, 255, 128, 0); + font_draw (x, gfx.res.y - font[0].size.y - 2, text, 0); for (i = 1, p = 0; p < MAX_PLAYERS; p++) { if (PS_IS_used (bman.players[p].state)) { @@ -395,6 +402,7 @@ void game_showresult () { if ((keys[SDLK_RETURN] || keys[SDLK_LCTRL] || keys[SDLK_RCTRL]) && (!keypressed) && (event.type = SDL_KEYDOWN)) { done = 1; keypressed = 1; + bman.state = GS_running; } if (event.type == SDL_KEYUP) diff --git a/src/mapmenu.c b/src/mapmenu.c index cce9b56..0d5f8ea 100644 --- a/src/mapmenu.c +++ b/src/mapmenu.c @@ -1,4 +1,4 @@ -/* $Id: mapmenu.c,v 1.7 2003/07/27 13:29:25 stpohle Exp $ */ +/* $Id: mapmenu.c,v 1.8 2003/07/27 20:16:58 stpohle Exp $ */ /* map/tileset selection menu */ #include "bomberclone.h" @@ -351,7 +351,7 @@ mapinfo () SDL_Flip (gfx.screen); keybinput_new (&ki); - while (!done) { + while (!done && bman.state == GS_wait) { if (bman.gametype == GT_multi && bman.sock != -1) { network_loop (); eventstate = SDL_PollEvent (&event); diff --git a/src/single.c b/src/single.c index aff7ce2..7a3d322 100644 --- a/src/single.c +++ b/src/single.c @@ -1,4 +1,4 @@ -/* $Id: single.c,v 1.41 2003/07/27 19:49:57 stpohle Exp $ */ +/* $Id: single.c,v 1.42 2003/07/27 20:16:58 stpohle Exp $ */ /* single player */ #include "basic.h" @@ -858,6 +858,7 @@ single_select_player () pos = 0; frame = 0; d = down; + dto = 5; } frame++; }