summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-16 10:38:08 +0200
commit6a0d150539897ec65ccc161305db48de10ea35ba (patch)
tree7064e569459bd8d704edd28552f48bf2978d61a0 /src/app
parentaf9af56bb007050c969af310c4e816d260b9ce7f (diff)
downloadcolobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.gz
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.tar.bz2
colobot-6a0d150539897ec65ccc161305db48de10ea35ba.zip
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
Diffstat (limited to 'src/app')
-rw-r--r--src/app/app.cpp6
1 files changed, 4 insertions, 2 deletions
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)
{