summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-05 15:34:11 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-05 16:25:18 +0300
commit08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f (patch)
tree7cd9be72ab884387173b2aaaa6421ebba7be1ed4 /src/input
parent05a196194b8270c1ae2e63f8ae31f8a492022388 (diff)
downloadmv-08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f.tar.gz
mv-08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f.tar.bz2
mv-08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f.tar.xz
mv-08d5f2d6f3eeded6d7a2e1adcf94e850098aa85f.zip
On room creation show room name in general tab caption.
Not allow move if in room.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputcondition.h3
-rw-r--r--src/input/inputmanager.cpp2
2 files changed, 4 insertions, 1 deletions
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;