diff options
| author | Jakob Fries <jakob.fries@gmail.com> | 2007-08-04 16:49:57 +0000 |
|---|---|---|
| committer | Jakob Fries <jakob.fries@gmail.com> | 2007-08-04 16:49:57 +0000 |
| commit | 9f35dfa5db968b8b3e4781fd653df8d5295fffa9 (patch) | |
| tree | 728ac886ac9c2e6e09ae8c3c1d9f1f92256e955e /src/game/client | |
| parent | 04ab18c37c3d34ec7f81367017c227584f14f8d9 (diff) | |
| download | zcatch-9f35dfa5db968b8b3e4781fd653df8d5295fffa9.tar.gz zcatch-9f35dfa5db968b8b3e4781fd653df8d5295fffa9.zip | |
added switch and noammo sounds. ingame chat works more intuitively (sp?)
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/game_client.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
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) { |