From 844e7343e065c80d40c7499cd2500b405083e2ea Mon Sep 17 00:00:00 2001 From: krzys-h Date: Mon, 24 Aug 2015 23:19:02 +0200 Subject: [PATCH] Possible fix to #601 --- src/graphics/engine/particle.h | 2 +- src/physics/physics.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphics/engine/particle.h b/src/graphics/engine/particle.h index f158bce4..1f8a8657 100644 --- a/src/graphics/engine/particle.h +++ b/src/graphics/engine/particle.h @@ -86,7 +86,7 @@ enum ParticleType PARTISMOKE2 = 27, //! < black smoke PARTISMOKE3 = 28, //! < black smoke PARTIBLOOD = 30, //! < human blood - PARTIBLOODM = 31, //! < blood laying + PARTIBLOODM = 31, //! < AlienQueen blood PARTIVAPOR = 32, //! < steam PARTIVIRUS = 33, //! < virus (random letter) PARTIRAY1 = 43, //! < ray 1 (turn) diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 606dc8a8..f2267c92 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -2878,7 +2878,7 @@ void CPhysics::FrameParticle(float aTime, float rTime) //bFlash = false; - float energy = GetObjectEnergy(m_object); + float energy = GetObjectEnergyLevel(m_object); if ( energy != m_lastEnergy ) // change the energy level? { @@ -2967,7 +2967,7 @@ void CPhysics::PowerParticle(float factor, bool bBreak) if ( bCarryPower ) // carry a battery? { - pos = Math::Vector(3.0f, 5.6f, 0.0f); // position of battery holder + pos = Math::Vector(3.0f, 5.6f, 0.0f); // position of battery holder // TODO: Move to CTransportableObject pos = Transform(*mat, pos); speed.x = (Math::Rand()-0.5f)*12.0f;