From 6a0d150539897ec65ccc161305db48de10ea35ba Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 16 Sep 2012 10:38:08 +0200 Subject: Interface works - removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken --- src/app/app.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/app.cpp b/src/app/app.cpp index ab3c33c..1bf9a54 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -371,6 +371,8 @@ bool CApplication::Create() // Create the robot application. m_robotMain = new CRobotMain(m_iMan, this); + m_robotMain->ChangePhase(PHASE_WELCOME1); + GetLogger()->Info("CApplication created successfully\n"); return true; @@ -854,7 +856,7 @@ bool CApplication::ProcessEvent(const Event &event) if (m_debugMode) l->Info("Focus change: active = %s\n", event.active.gain ? "true" : "false"); - if (m_active != event.active.gain) + /*if (m_active != event.active.gain) { m_active = event.active.gain; @@ -862,7 +864,7 @@ bool CApplication::ProcessEvent(const Event &event) ResumeSimulation(); else SuspendSimulation(); - } + }*/ } else if (event.type == EVENT_KEY_DOWN) { -- cgit v1.2.3-1-g7c22