diff options
author | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
commit | 2d043d46bb85f486847300080e4d58add49c0a44 (patch) | |
tree | b79da960c4d3b7d0452b0a199be19da61133df30 /src/ui | |
parent | d3a722a0c56119f13d5ff3e68e9f4560c7924788 (diff) | |
parent | d019a4990f2e2da71555daf085a3e09c92085fa5 (diff) | |
download | colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.gz colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.bz2 colobot-2d043d46bb85f486847300080e4d58add49c0a44.zip |
Merge branch 'vieux-blood_mode' into dev
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/maindialog.cpp | 23 | ||||
-rw-r--r-- | src/ui/maindialog.h | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index cc0c8ec..fe40609 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -170,6 +170,7 @@ CMainDialog::CMainDialog() m_bCameraInvertX = false; m_bCameraInvertY = false; m_bEffect = true; + m_bBlood = true; m_shotDelay = 0; m_glintMouse = Math::Point(0.0f, 0.0f); @@ -1213,6 +1214,9 @@ void CMainDialog::ChangePhase(Phase phase) pos.y -= 0.048f; pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_EFFECT); pc->SetState(STATE_SHADOW); + pos.y -= 0.048f; + pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_BLOOD); + pc->SetState(STATE_SHADOW); //? pos.y -= 0.048f; //? pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_NICERST); //? pc->SetState(STATE_SHADOW); @@ -2535,6 +2539,13 @@ bool CMainDialog::EventProcess(const Event &event) UpdateSetupButtons(); break; + case EVENT_INTERFACE_BLOOD: + m_bBlood = !m_bBlood; + m_camera->SetBlood(m_bBlood); + ChangeSetupButtons(); + UpdateSetupButtons(); + break; + default: break; } @@ -4856,6 +4867,12 @@ void CMainDialog::UpdateSetupButtons() pc->SetState(STATE_CHECK, m_bEffect); } + pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_BLOOD)); + if ( pc != 0 ) + { + pc->SetState(STATE_CHECK, m_bBlood); + } + pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW)); if ( pc != 0 ) { @@ -5041,6 +5058,7 @@ void CMainDialog::SetupMemorize() GetProfile().SetIntProperty("Setup", "CameraInvertX", m_bCameraInvertX); GetProfile().SetIntProperty("Setup", "CameraInvertY", m_bCameraInvertY); GetProfile().SetIntProperty("Setup", "InterfaceEffect", m_bEffect); + GetProfile().SetIntProperty("Setup", "Blood", m_bBlood); GetProfile().SetIntProperty("Setup", "GroundShadow", m_engine->GetShadow()); GetProfile().SetIntProperty("Setup", "GroundSpot", m_engine->GetGroundSpot()); GetProfile().SetIntProperty("Setup", "ObjectDirty", m_engine->GetDirty()); @@ -5189,6 +5207,11 @@ void CMainDialog::SetupRecall() m_bEffect = iValue; } + if ( GetProfile().GetIntProperty("Setup", "Blood", iValue) ) + { + m_bBlood = iValue; + } + if ( GetProfile().GetIntProperty("Setup", "GroundShadow", iValue) ) { m_engine->SetShadow(iValue); diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index 1ff9045..355b18e 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -245,6 +245,7 @@ protected: bool m_bCameraInvertX; // for CCamera bool m_bCameraInvertY; // for CCamera bool m_bEffect; // for CCamera + bool m_bBlood; // for CCamera Math::Point m_glintMouse; float m_glintTime; |