diff options
| author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
|---|---|---|
| committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
| commit | 7bce8f073c9212247d104266d417e46e884b72c2 (patch) | |
| tree | 89da914094bf7d0e92c5da1e14e9e4298340c799 /src/ui/maindialog.cpp | |
| parent | 36ae984ac77c5545d3d11dde7e37913a8eff0b0d (diff) | |
| parent | da5d4edeb3a41462ec987cb4994a6897823f3f76 (diff) | |
| download | colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.gz colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.bz2 colobot-7bce8f073c9212247d104266d417e46e884b72c2.zip | |
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
src/ui/slider.cpp
Diffstat (limited to 'src/ui/maindialog.cpp')
| -rw-r--r-- | src/ui/maindialog.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index e3d1b0a..a2fc733 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -56,7 +56,7 @@ const int KEY_TOTAL = 13; // total number of keys redefinable #else*/ const int KEY_TOTAL = 21; // total number of keys redefinable -const int WELCOME_LENGTH = 2.0f; +const float WELCOME_LENGTH = 2.0f; @@ -413,12 +413,12 @@ void CMainDialog::ChangePhase(Phase phase) pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } @@ -535,12 +535,12 @@ void CMainDialog::ChangePhase(Phase phase) UpdateNameControl(); UpdateNameFace(); - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } @@ -987,12 +987,12 @@ void CMainDialog::ChangePhase(Phase phase) pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_BACK); pb->SetState(STATE_SHADOW); - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } @@ -1186,12 +1186,12 @@ void CMainDialog::ChangePhase(Phase phase) if ( !m_bSimulSetup ) { - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } } @@ -1728,12 +1728,12 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_READ ) { - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } } @@ -1778,12 +1778,12 @@ void CMainDialog::ChangePhase(Phase phase) pl->SetFontSize(12.0f); pl->SetTextAlign(Gfx::TEXT_ALIGN_CENTER); - m_engine->SetBackground("inter01.png", + m_engine->SetBackground("interface.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); m_loadingCounter = 1; // enough time to display! @@ -1808,7 +1808,7 @@ void CMainDialog::ChangePhase(Phase phase) Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, false); + true, Math::Point(861.0f / 1024.0f, 646.0f / 1024.0f)); m_engine->SetBackForce(true); } if ( m_phase == PHASE_WELCOME2 ) @@ -1830,7 +1830,7 @@ void CMainDialog::ChangePhase(Phase phase) Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, false); + true, Math::Point(640.0f / 1024.0f, 480.0f / 512.0f)); m_engine->SetBackForce(true); } if ( m_phase == PHASE_WELCOME3 ) @@ -1844,12 +1844,12 @@ void CMainDialog::ChangePhase(Phase phase) m_engine->SetOverColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::ENG_RSTATE_TCOLOR_WHITE); // TODO: color ok? m_engine->SetOverFront(true); - m_engine->SetBackground("epsitece.png", + m_engine->SetBackground("epsitec.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, false); + true, Math::Point(640.0f / 1024.0f, 480.0f / 512.0f)); m_engine->SetBackForce(true); } @@ -1980,12 +1980,12 @@ void CMainDialog::ChangePhase(Phase phase) pb->SetState(STATE_SHADOW); // #endif - m_engine->SetBackground("genere.png", + m_engine->SetBackground("generic.png", Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), - true, true); + true, Math::Point(1.0f, 768.0f / 1024.0f)); m_engine->SetBackForce(true); } |