sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't make TAB exit game if bound to inventory. 

I play with the TAB key bound to the inventory. However, the
code here assumes that TAB means "close formspec" in all contexts,
including the main menu. This causes my game to exit when I attempt
to TAB in between USERNAME and PASSWORD fields.

We know when m_client != NULL that the game is a client game and
not in the main menu, and then it's OK to use the INVENTORY bound
key to exit the formspec, since it's not the main menu.
master
Auke Kok 2017-04-14 22:16:57 -07:00 committed by Auke Kok
parent 6120251320
commit 5433e9bd19
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/guiFormSpecMenu.cpp
View File

@ -3296,8 +3296,9 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
{ {
if (event.EventType==EET_KEY_INPUT_EVENT) { if (event.EventType==EET_KEY_INPUT_EVENT) {
KeyPress kp(event.KeyInput); KeyPress kp(event.KeyInput);
if (event.KeyInput.PressedDown && ( (kp == EscapeKey) || if (event.KeyInput.PressedDown && (
(kp == getKeySetting("keymap_inventory")) || (kp == CancelKey))) { (kp == EscapeKey) || (kp == CancelKey) ||
((m_client != NULL) && (kp == getKeySetting("keymap_inventory"))))) {
tryClose(); tryClose();
return true; return true;
} else if (m_client != NULL && event.KeyInput.PressedDown && } else if (m_client != NULL && event.KeyInput.PressedDown &&