summaryrefslogtreecommitdiffstats
path: root/src/physics/physics.cpp
diff options
context:
space:
mode:
authorZaba999 <qrwfw5rp>2012-09-29 23:53:57 +0200
committerZaba999 <qrwfw5rp>2012-09-29 23:53:57 +0200
commit95e1d101c82e43396fd93abfaa522e3651613c4c (patch)
tree9d72f27e84a25c7a744b31eb7612698506ac5b68 /src/physics/physics.cpp
parentaa9df8b1f0fbbad4c7be0214a19a90b8495a2067 (diff)
parentc8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff)
downloadcolobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.gz
colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.bz2
colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.zip
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/physics/physics.cpp')
-rw-r--r--src/physics/physics.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 40dbdc7..a3c680b 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -3016,7 +3016,12 @@ void CPhysics::FrameParticle(float aTime, float rTime)
effectLight = m_object->GetEffectLight();
if ( effectLight != -1 )
{
- if ( bFlash )
+ /*
+ * TODO: this is supposed to flash lights of robot without power,
+ * but doesn't work correctly (e.g. beginning of scene201).
+ * Commenting out for the time being.
+ */
+ /*if ( bFlash )
{
intensity = 0.0f;
if ( Math::Rand() < 0.5f ) intensity = 1.0f;
@@ -3024,9 +3029,9 @@ void CPhysics::FrameParticle(float aTime, float rTime)
m_lightMan->SetLightIntensitySpeed(effectLight, 10000.0f);
}
else
- {
+ {*/
m_lightMan->SetLightIntensity(effectLight, 0.0f);
- }
+ /*}*/
}
}