From 08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Apr 2015 15:34:11 +0300 Subject: On room creation show room name in general tab caption. Not allow move if in room. --- src/input/inputcondition.h | 3 ++- src/input/inputmanager.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/input') diff --git a/src/input/inputcondition.h b/src/input/inputcondition.h index de479b328..5687b6f6a 100644 --- a/src/input/inputcondition.h +++ b/src/input/inputcondition.h @@ -45,11 +45,12 @@ namespace InputCondition // dialogs what prevent moving ALIVE = 32768, // player alive NOVENDING = 65536, // vending disabled + NOROOM = 131072, // not joined room SHORTCUT = 2 + 4 + 16 + 512 + 2048, // flags for shortcut keys SHORTCUT0 = 2 + 4 + 16 + 512, // flags for shortcut keys GAME = 2 + 4 + 8 + 16 + 64 + 2048, // main game key GAME2 = 2 + 8 + 16 + 64 + 2048, - ARROWKEYS = 2 + 4 + 8 + 16 + 64 + 2048 + 4096 + 16384 + 65536 + ARROWKEYS = 2 + 4 + 8 + 16 + 64 + 2048 + 4096 + 16384 + 65536 + 131072 }; } // namespace InputCondition diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 11ff7f291..c60056c3e 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -693,6 +693,8 @@ void InputManager::updateConditionMask() if (!PlayerInfo::isVending()) mMask |= InputCondition::NOVENDING; + if (!PlayerInfo::isInRoom()) + mMask |= InputCondition::NOROOM; if (!settings.awayMode) mMask |= InputCondition::NOAWAY; -- cgit v1.2.3-60-g2f50