From 5ab546f67d21e037deafbec70ca8f367687a389f Mon Sep 17 00:00:00 2001
From: Daniel Gibson <metalcaedes@gmail.com>
Date: Sat, 3 Oct 2015 18:58:49 +0200
Subject: [PATCH] Esc should only open menu if shift isn't pressed (=>
shift+esc for console)
When ingame, Shift-Esc would open the menu and another Shift-Esc the
console. Now it immediately opens the console and only Esc without
Shift opens the menu.
---
neo/framework/Session.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/neo/framework/Session.cpp b/neo/framework/Session.cpp
index a2c4c2a2..579a6623 100644
--- a/neo/framework/Session.cpp
+++ b/neo/framework/Session.cpp
@@ -2148,7 +2148,9 @@ idSessionLocal::ProcessEvent
*/
bool idSessionLocal::ProcessEvent( const sysEvent_t *event ) {
// hitting escape anywhere brings up the menu
- if ( !guiActive && event->evType == SE_KEY && event->evValue2 == 1 && event->evValue == K_ESCAPE ) {
+ // DG: but shift-escape should bring up console instead so ignore that
+ if ( !guiActive && event->evType == SE_KEY && event->evValue2 == 1
+ && event->evValue == K_ESCAPE && !idKeyInput::IsDown( K_SHIFT ) ) {
console->Close();
if ( game ) {
idUserInterface *gui = NULL;