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/object/auto | |
| 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/object/auto')
| -rw-r--r-- | src/object/auto/autobase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index f354f28..d7b3ca1 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -1387,8 +1387,6 @@ Error CAutoBase::CheckCloseDoor() void CAutoBase::BeginTransit() { - bool bFull, bQuarter; - if ( m_param == PARAM_TRANSIT2 ) { m_bgBack = "back01.png"; // clouds orange / blue @@ -1410,7 +1408,9 @@ void CAutoBase::BeginTransit() m_engine->SetDeepView(2000.0f); // we see very far m_engine->ApplyChange(); - m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, bFull, bQuarter); + Math::Point scale; + bool full; + m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, full, scale); m_engine->DeleteTexture(m_bgName); m_engine->SetBackground(m_bgBack, Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), |