This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit 1182dea692c521e39cefba0eb255da22b990e20f Merge: ad9915d ce480c1 Author: Piotr Dziwinski <piot...@gmail.com> Date: Tue Nov 10 21:33:02 2015 +0000 Merge pull request #678 src/level/robotmain.cpp | 55 ++++++++++++++++++++++++++++--------------------- src/ui/displayinfo.cpp | 4 ++-- src/ui/maindialog.cpp | 4 ++-- src/ui/studio.cpp | 4 ++-- 4 files changed, 38 insertions(+), 29 deletions(-) diff --cc src/level/robotmain.cpp index 6290075,a68f544..483f080 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@@ -426,7 -426,13 +426,13 @@@ void CRobotMain::ChangePhase(Phase phas } m_phase = phase; - + + if (m_phase != PHASE_SIMUL) + { - Ui::CWindow* pw = static_cast<Ui::CWindow*>(m_interface->SearchControl(EVENT_WINDOW6)); - if ( pw != nullptr ) pw->ClearState(Ui::STATE_VISIBLE | Ui::STATE_ENABLE); - } ++ Ui::CWindow* pw = static_cast<Ui::CWindow*>(m_interface->SearchControl(EVENT_WINDOW6)); ++ if ( pw != nullptr ) pw->ClearState(Ui::STATE_VISIBLE | Ui::STATE_ENABLE); ++ } + if (resetWorld) { m_winDelay = 0.0f; @@@ -5915,33 -5921,36 +5921,36 @@@ void CRobotMain::StartDetectEffect(COld void CRobotMain::CreateCodeBattleInterface() { - Math::Point pos, ddim; - if(m_phase == PHASE_SIMUL) - { - Math::Point pos, ddim; - - ddim.x = 100.0f/640.0f; - ddim.y = 100.0f/480.0f; - pos.x = 540.0f/640.0f; - pos.y = 100.0f/480.0f; - Ui::CWindow* pw = m_interface->CreateWindows(pos, ddim, 3, EVENT_WINDOW6); - - ddim.x = 100.0f/640.0f; - ddim.y = 16.0f/480.0f; - pos.x = 540.0f/640.0f; - pos.y = 178.0f/480.0f; - pw->CreateLabel(pos, ddim, 0, EVENT_LABEL0, "Code battle"); - - float titleBarSize = (11.0f/64.0f); // this is from the texture - ddim.x = 80.0f/640.0f; - ddim.y = ((1-titleBarSize)*100.0f-20.0f)/480.0f; - pos.x = 550.0f/640.0f; - pos.y = 110.0f/480.0f; - if (!m_codeBattleStarted) - { - pw->CreateButton(pos, ddim, 21, EVENT_CODE_BATTLE_START); - } - else - { - pw->CreateButton(pos, ddim, 13, EVENT_CODE_BATTLE_SPECTATOR); - } - } ++ if(m_phase == PHASE_SIMUL) ++ { ++ Math::Point pos, ddim; + - ddim.x = 100.0f/640.0f; - ddim.y = 100.0f/480.0f; - pos.x = 540.0f/640.0f; - pos.y = 100.0f/480.0f; - Ui::CWindow* pw = m_interface->CreateWindows(pos, ddim, 3, EVENT_WINDOW6); ++ ddim.x = 100.0f/640.0f; ++ ddim.y = 100.0f/480.0f; ++ pos.x = 540.0f/640.0f; ++ pos.y = 100.0f/480.0f; ++ Ui::CWindow* pw = m_interface->CreateWindows(pos, ddim, 3, EVENT_WINDOW6); + - ddim.x = 100.0f/640.0f; - ddim.y = 16.0f/480.0f; - pos.x = 540.0f/640.0f; - pos.y = 178.0f/480.0f; - pw->CreateLabel(pos, ddim, 0, EVENT_LABEL0, "Code battle"); ++ ddim.x = 100.0f/640.0f; ++ ddim.y = 16.0f/480.0f; ++ pos.x = 540.0f/640.0f; ++ pos.y = 178.0f/480.0f; ++ pw->CreateLabel(pos, ddim, 0, EVENT_LABEL0, "Code battle"); + - float titleBarSize = (11.0f/64.0f); // this is from the texture - ddim.x = 80.0f/640.0f; - ddim.y = ((1-titleBarSize)*100.0f-20.0f)/480.0f; - pos.x = 550.0f/640.0f; - pos.y = 110.0f/480.0f; - if (!m_codeBattleStarted) - { - pw->CreateButton(pos, ddim, 21, EVENT_CODE_BATTLE_START); - } - else - { - pw->CreateButton(pos, ddim, 13, EVENT_CODE_BATTLE_SPECTATOR); ++ float titleBarSize = (11.0f/64.0f); // this is from the texture ++ ddim.x = 80.0f/640.0f; ++ ddim.y = ((1-titleBarSize)*100.0f-20.0f)/480.0f; ++ pos.x = 550.0f/640.0f; ++ pos.y = 110.0f/480.0f; ++ if (!m_codeBattleStarted) ++ { ++ pw->CreateButton(pos, ddim, 21, EVENT_CODE_BATTLE_START); ++ } ++ else ++ { ++ pw->CreateButton(pos, ddim, 13, EVENT_CODE_BATTLE_SPECTATOR); ++ } + } } void CRobotMain::DestroyCodeBattleInterface() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits