immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possible fix to #601

master
krzys-h 2015-08-24 23:19:02 +02:00
parent 07141f6d90
commit 844e7343e0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/engine/particle.h
View File

@ -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)

4
src/physics/physics.cpp
View File

@ -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;