From 9f35dfa5db968b8b3e4781fd653df8d5295fffa9 Mon Sep 17 00:00:00 2001
From: Jakob Fries <jakob.fries@gmail.com>
Date: Sat, 4 Aug 2007 16:49:57 +0000
Subject: added switch and noammo sounds. ingame chat works more intuitively
 (sp?)

---
 src/game/client/game_client.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/game/client/game_client.cpp')

diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 344aaf55..57618202 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1202,7 +1202,10 @@ void modc_render()
 
 	if (inp_key_down(input::esc))
 	{
-		menu_active = !menu_active;
+		if (chat_active)
+			chat_active = false;
+		else
+			menu_active = !menu_active;
 	}
 	
 	if (!menu_active)
@@ -1556,12 +1559,6 @@ void modc_render()
 			y += 44;
 		}
 	}
-
-	if (menu_active)
-	{
-		ingamemenu_render();
-		return;
-	}
 	
 	// render chat
 	{
@@ -1592,6 +1589,12 @@ void modc_render()
 		}
 	}
 	
+	if (menu_active)
+	{
+		ingamemenu_render();
+		return;
+	}
+
 	// render goals
 	if(gameobj)
 	{
-- 
cgit 1.4.1