Merge branch 'vieux-blood_mode' into dev

Conflicts:
	src/common/restext.cpp
	src/ui/maindialog.cpp

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;