From a47fe88d196735a52809a1387ed67aa1a767bd4f Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Wed, 27 Aug 2008 20:23:50 +0000
Subject: ingame menu fixed

---
 src/game/client/components/hud.cpp   |  4 ----
 src/game/client/components/menus.cpp | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/game/client')

diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
index af8c9b5c..05df0702 100644
--- a/src/game/client/components/hud.cpp
+++ b/src/game/client/components/hud.cpp
@@ -1,9 +1,5 @@
 #include <memory.h> // memcmp
 
-extern "C" {
-	#include <engine/e_config.h>
-}
-
 #include <engine/e_client_interface.h>
 #include <game/generated/g_protocol.hpp>
 #include <game/generated/gc_data.hpp>
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index fc409821..e3212ceb 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -955,6 +955,16 @@ bool MENUS::on_mousemove(float x, float y)
 
 bool MENUS::on_input(INPUT_EVENT e)
 {
+//	if(e.)
+	//
+	if(e.flags&INPFLAG_PRESS && e.key == KEY_ESC)
+	{
+		menu_active	= !menu_active;
+		return true;
+	}
+	
+	if(menu_active)
+		return true;
 	return false;
 }
 
@@ -982,13 +992,14 @@ void MENUS::on_statechange(int new_state, int old_state)
 	{
 		popup = POPUP_NONE;
 		menu_active = false;
-	 	//menu_game_active = true;
-	 	//snapshot_count = 0;
 	}
 }
 
 void MENUS::on_render()
 {
+	if(client_state() != CLIENTSTATE_ONLINE)
+		menu_active = true;
+	
 	if(!menu_active)
 		return;
 
-- 
cgit 1.4.1