From ca297c3a9ab573fedebab6bc4e6b8ae9f91206a8 Mon Sep 17 00:00:00 2001
From: stpohle <stpohle>
Date: Sun, 12 Sep 2004 21:49:13 +0000
Subject: [PATCH] quit game button in the InGame menu is working now

---
 ChangeLog  | 4 +++-
 src/game.c | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03674d3..a31866a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.78 2004/09/12 21:08:11 stpohle Exp $
+$Id: ChangeLog,v 1.79 2004/09/12 21:50:55 stpohle Exp $
 
 * NEED TO FIX: Server starts the game soo fast that the
   client's ignore the gamestat for a running game.
@@ -6,6 +6,8 @@ $Id: ChangeLog,v 1.78 2004/09/12 21:08:11 stpohle Exp $
 
 * FINISH TEAM MODE.
 
+- fixed: Quit Game wasn't working from the in game menu
+
 - fixed: Network Version Error. There is no 
   possible Escape.
 
diff --git a/src/game.c b/src/game.c
index 191f140..fe36912 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.88 2004/06/16 00:41:29 stpohle Exp $ 
+/* $Id: game.c,v 1.89 2004/09/12 21:49:13 stpohle Exp $ 
   game.c - procedures for the game. */
 
 #include <string.h>
@@ -498,7 +498,7 @@ void game_showresult () {
 	SDL_Flip (gfx.screen);
 	gfx_free_players ();
 
-    while (!done) {
+    while (!done && bman.state != GS_quit) {
         /* do the keyboard handling */
         if (SDL_PollEvent (&event) != 0)
             switch (event.type) {
@@ -590,7 +590,7 @@ void game_menu_loop (SDL_Event *event, int eventstate) {
 		}
 		
 		else if (menu->focus->id == 3) 							/* End Game */
-			bman.state = GS_startup;
+			bman.state = GS_quit;
 		
 		else { 													/* Quit Menu */
 			menu_delete (menu);