diff --git a/TODO b/TODO index 1ab654c..47c3b07 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,16 @@ -$Id: TODO,v 1.28 2003/12/28 19:07:37 stpohle Exp $ +$Id: TODO,v 1.29 2003/12/28 20:11:44 stpohle Exp $ * check if the player is on a field with an running explosion -* Multiplayer: playerselection get mixed up somehow. +- better configuration for home made map files + +- opetion that you can have only one illness.. if you catch + a new one you will lose the old one and someone else can + catch this one. + +- player will lose all his power if he die and other people + can collect his powerups. - multiplayer broadcast in the local network ip: 10.*.*.* and 192.168.*.* diff --git a/src/game.c b/src/game.c index c8d1a44..697b48e 100644 --- a/src/game.c +++ b/src/game.c @@ -1,4 +1,4 @@ -/* $Id: game.c,v 1.65 2003/12/28 19:07:38 stpohle Exp $ +/* $Id: game.c,v 1.66 2003/12/28 20:11:46 stpohle Exp $ game.c - procedures for the game. */ #include @@ -399,13 +399,13 @@ void game_showresult () { strcpy (text, "[CTRL],[RETURN] or [STRG] for another game"); x = (gfx.res.x - (font[1].size.x * strlen (text)) - 64) / 2; - font_drawbold (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0, 6, 2); - font_draw (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0, 5); + font_drawbold (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0, COLOR_brown, 1); + font_draw (x, gfx.res.y - (2*font[0].size.y) - 2, text, 0, COLOR_yellow); strcpy (text, "or [ESC] to leave the game."); x = (gfx.res.x - (font[1].size.x * strlen (text)) - 64) / 2; - font_drawbold (x, gfx.res.y - font[0].size.y - 2, text, 0, 6, 2); - font_draw (x, gfx.res.y - font[0].size.y - 2, text, 0, 5); + font_drawbold (x, gfx.res.y - font[0].size.y - 2, text, 0, COLOR_brown, 1); + font_draw (x, gfx.res.y - font[0].size.y - 2, text, 0, COLOR_yellow); for (i = 1, p = 0; p < MAX_PLAYERS; p++) { if (PS_IS_used (players[p].state)) { @@ -419,11 +419,12 @@ void game_showresult () { x = 16; } - font_drawbold (x + 80, y + 4, players[p].name, 0, 4, 2); - if (PS_IS_alife (players[p].state)) - font_draw (x + 80, y + 4, players[p].name, 0, 0); - else - font_draw (x + 80, y + 4, players[p].name, 0, 4); + if (PS_IS_alife (players[p].state)) { + font_drawbold (x + 80, y + 4, players[p].name, 0, COLOR_brown, 1); + font_draw (x + 80, y + 4, players[p].name, 0, COLOR_yellow); + } + else + font_draw (x + 80, y + 4, players[p].name, 0, COLOR_gray); sprintf (text, "%3d", players[p].wins); font_draw (x + 80 + (LEN_PLAYERNAME+2) * font[0].size.x, y + 4, text, 0, 0); diff --git a/src/multiwait.c b/src/multiwait.c index 04a29b4..ac2ef1f 100644 --- a/src/multiwait.c +++ b/src/multiwait.c @@ -265,6 +265,7 @@ wait_for_players () if (network_loop () < 0) { done = 1; bman.p_nr = -1; + bman.state = GS_startup; } if (i != bman.p_nr) /* clean the screen after we got our playernumber */ draw_logo (); diff --git a/src/netmenu.c b/src/netmenu.c index 19e8ee7..c4ac632 100644 --- a/src/netmenu.c +++ b/src/netmenu.c @@ -126,8 +126,6 @@ multiplayer_firstrun () * We will host a network game */ void host_multiplayer_game () { - int i; - if (bman.firewall) { return; }