summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2014-02-02 01:51:14 +0100
committererihel <erihel@gmail.com>2014-02-02 01:51:14 +0100
commit93582536ded303f4c9c358ef9967deb07d638e54 (patch)
tree2ba781604f31af20b20fc43fa647491d4c82de32 /src/app
parentd84d38280b3ed706ff2371fc88e43a2a7245d3dd (diff)
parent70b18cc4c05398cd06558f4634937a70c2436546 (diff)
downloadcolobot-93582536ded303f4c9c358ef9967deb07d638e54.tar.gz
colobot-93582536ded303f4c9c358ef9967deb07d638e54.tar.bz2
colobot-93582536ded303f4c9c358ef9967deb07d638e54.zip
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp
index a2162b1..70bec81 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -960,15 +960,15 @@ int CApplication::Run()
{
LogEvent(event);
- StartPerformanceCounter(PCNT_UPDATE_ENGINE);
- m_engine->FrameUpdate();
- StopPerformanceCounter(PCNT_UPDATE_ENGINE);
-
m_sound->FrameMove(m_relTime);
StartPerformanceCounter(PCNT_UPDATE_GAME);
m_robotMain->ProcessEvent(event);
StopPerformanceCounter(PCNT_UPDATE_GAME);
+
+ StartPerformanceCounter(PCNT_UPDATE_ENGINE);
+ m_engine->FrameUpdate();
+ StopPerformanceCounter(PCNT_UPDATE_ENGINE);
}
StopPerformanceCounter(PCNT_UPDATE_ALL);