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/graphics/engine | |
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/graphics/engine')
-rw-r--r-- | src/graphics/engine/camera.cpp | 10 | ||||
-rw-r--r-- | src/graphics/engine/camera.h | 4 | ||||
-rw-r--r-- | src/graphics/engine/pyro.cpp | 6 |
3 files changed, 17 insertions, 3 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; diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h index 3478086..4fe821f 100644 --- a/src/graphics/engine/camera.h +++ b/src/graphics/engine/camera.h @@ -200,6 +200,8 @@ public: void SetScriptLookat(Math::Vector lookat); void SetEffect(bool enable); + void SetBlood(bool enable); + bool GetBlood(); void SetCameraScroll(bool scroll); void SetCameraInvertX(bool invert); void SetCameraInvertY(bool invert); @@ -381,6 +383,8 @@ protected: //! Shocks if explosion? bool m_effect; + //! Blood? + bool m_blood; //! Scroll in the edges? bool m_cameraScroll; //! X inversion in the edges? diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 42f0e84..8d5d323 100644 --- a/src/graphics/engine/pyro.cpp +++ b/src/graphics/engine/pyro.cpp @@ -314,7 +314,7 @@ bool CPyro::Create(PyroType type, CObject* obj, float force) } if ( m_type == PT_SHOTH ) { - if ( m_object->GetSelect() ) + if ( m_camera->GetBlood() && m_object->GetSelect() ) { m_camera->StartOver(CAM_OVER_EFFECT_BLOOD, m_pos, force); } @@ -674,7 +674,7 @@ bool CPyro::EventProcess(const Event &event) } } - if ( m_type == PT_SHOTH && + if ( m_camera->GetBlood() && m_type == PT_SHOTH && m_lastParticle+m_engine->ParticleAdapt(0.05f) <= m_time ) { m_lastParticle = m_time; @@ -696,7 +696,7 @@ bool CPyro::EventProcess(const Event &event) } } - if ( m_type == PT_SHOTM && + if ( m_camera->GetBlood() && m_type == PT_SHOTM && m_lastParticle+m_engine->ParticleAdapt(0.05f) <= m_time ) { m_lastParticle = m_time; |