Merge branch 'vieux-blood_mode' into dev

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

1 files changed, 10 insertions, 0 deletions

diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp
index b7769ab..6464b22 100644
--- a/src/graphics/engine/camera.cpp
+++ b/src/graphics/engine/camera.cpp
@@ -139,6 +139,7 @@ CCamera::CCamera()
     m_scriptLookat = Math::Vector(0.0f, 0.0f, 0.0f);
 
     m_effect        = true;
+    m_blood         = true;
     m_cameraScroll  = true;
     m_cameraInvertX = false;
     m_cameraInvertY = false;
@@ -153,6 +154,15 @@ void CCamera::SetEffect(bool enable)
     m_effect = enable;
 }
 
+void CCamera::SetBlood(bool enable)
+{
+    m_blood = enable;
+}
+
+bool CCamera::GetBlood() {
+    return m_blood;
+}
+
 void CCamera::SetCameraScroll(bool scroll)
 {
     m_cameraScroll = scroll;