diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-06-27 19:50:09 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-06-27 19:52:09 +0200 |
| commit | 1835d2ae580525603308206f7b8e6b4552b3ca0f (patch) | |
| tree | 159fb045b27e9d816819b22a30e7f5b0b2eee173 /src/physics | |
| parent | 400bcd60fe07ef313f3944dda725020e0f6485da (diff) | |
| download | colobot-1835d2ae580525603308206f7b8e6b4552b3ca0f.tar.gz colobot-1835d2ae580525603308206f7b8e6b4552b3ca0f.tar.bz2 colobot-1835d2ae580525603308206f7b8e6b4552b3ca0f.zip | |
Removed old code based on #ifs (issue #55)
Diffstat (limited to 'src/physics')
| -rw-r--r-- | src/physics/physics.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index ad59ec0..a3aaa28 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -2581,16 +2581,10 @@ int CPhysics::ObjectAdapt(const Math::Vector &pos, const Math::Vector &angle) (oType >= OBJECT_MUSHROOM1 && oType <= OBJECT_MUSHROOM2) ) continue; } -/* TODO: #if _TEEN - if ( oType == OBJECT_WAYPOINT && - pObj->GetEnable() && - !m_object->GetResetBusy() ) // driving vehicle? -#else */ if ( oType == OBJECT_WAYPOINT && pObj->GetEnable() && !m_object->GetResetBusy() && m_object->GetTrainer() ) // driving vehicle? -/* #endif */ { oPos = pObj->GetPosition(0); distance = Math::DistanceProjected(oPos, iPos); @@ -2996,15 +2990,15 @@ void CPhysics::FrameParticle(float aTime, float rTime) { Math::Vector pos; CObject* power; - float energy, intensity; + float energy/*, intensity*/; int effectLight; - bool bFlash; + //bool bFlash; m_restBreakParticle -= rTime; if ( aTime-m_lastPowerParticle < m_engine->ParticleAdapt(0.05f) ) return; m_lastPowerParticle = aTime; - bFlash = false; + //bFlash = false; energy = 0.0f; power = m_object->GetPower(); @@ -3018,7 +3012,7 @@ void CPhysics::FrameParticle(float aTime, float rTime) if ( energy > m_lastEnergy ) // recharge? { PowerParticle(1.0f, false); - bFlash = true; + //bFlash = true; } if ( energy == 0.0f || m_lastEnergy == 0.0f ) @@ -3032,7 +3026,7 @@ void CPhysics::FrameParticle(float aTime, float rTime) if ( m_restBreakParticle > 0.0f ) { PowerParticle(m_restBreakParticle/2.5f, (energy == 0)); - bFlash = true; + //bFlash = true; } effectLight = m_object->GetEffectLight(); |