summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-23 15:03:29 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-23 15:03:29 +0300
commit78d67cdf35c80381366fee29b212aca23d7240fd (patch)
treee7ff8114a949215ffcedab4d508fd9695daacc2e
parent2fcc104aadb12abc32b730cbfd775917455a75e1 (diff)
downloadmanaverse-78d67cdf35c80381366fee29b212aca23d7240fd.tar.gz
manaverse-78d67cdf35c80381366fee29b212aca23d7240fd.tar.bz2
manaverse-78d67cdf35c80381366fee29b212aca23d7240fd.tar.xz
manaverse-78d67cdf35c80381366fee29b212aca23d7240fd.zip
Fix profiler labels.
-rw-r--r--src/game.cpp3
-rw-r--r--src/gui/gui.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 58cc9343e..6f01527d6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -946,7 +946,10 @@ void Game::handleInput()
checkKeys();
if (inputManager.handleEvent(event))
+ {
+ BLOCK_END("Game::handleInput 2")
return;
+ }
switch (event.type)
{
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a6e222183..fbd37f9a9 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -328,12 +328,10 @@ void Gui::clearFonts()
bool Gui::handleInput()
{
- BLOCK_START("Gui::handleInput")
if (mInput)
return handleKeyInput2();
else
return false;
- BLOCK_END("Gui::handleInput")
}
bool Gui::handleKeyInput2()