summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-23 16:40:20 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-23 16:40:20 +0300
commit34cc4ba555814f7907400b4d4b2c5e9fbfa99d22 (patch)
treefd4ec8d73ad00f54c62c9ee952f8fb1b6472dbb1 /src
parent1b864413966ca75990611a063e36a65372c00cf6 (diff)
downloadmv-34cc4ba555814f7907400b4d4b2c5e9fbfa99d22.tar.gz
mv-34cc4ba555814f7907400b4d4b2c5e9fbfa99d22.tar.bz2
mv-34cc4ba555814f7907400b4d4b2c5e9fbfa99d22.tar.xz
mv-34cc4ba555814f7907400b4d4b2c5e9fbfa99d22.zip
More fixed for profiler labels.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 6f01527d6..0a579a9ad 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -948,6 +948,7 @@ void Game::handleInput()
if (inputManager.handleEvent(event))
{
BLOCK_END("Game::handleInput 2")
+ BLOCK_END("Game::handleInput 1")
return;
}
@@ -979,13 +980,17 @@ void Game::handleInput()
// If the user is configuring the keys then don't respond.
if (!player_node || !keyboard.isEnabled() || player_node->getAway())
+ {
+ BLOCK_END("Game::handleInput 1")
return;
+ }
// If pressed outfits keys, stop processing keys.
if (inputManager.isActionActive(Input::KEY_WEAR_OUTFIT)
|| inputManager.isActionActive(Input::KEY_COPY_OUTFIT)
|| (setupWindow && setupWindow->isVisible()))
{
+ BLOCK_END("Game::handleInput 1")
return;
}