summaryrefslogtreecommitdiffstats
path: root/src/old/pyro.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-26 23:08:41 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-26 23:08:41 +0200
commit77bd13f49fb974cb50918b18d166ab61240c0d34 (patch)
tree2a824960ef146e23ca772c8dc0215e70f586ed8f /src/old/pyro.cpp
parent6a059b437dca706a72233a57ba4c22011aba6dde (diff)
parentc2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff)
downloadcolobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz
colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2
colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/old/pyro.cpp')
-rw-r--r--src/old/pyro.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/old/pyro.cpp b/src/old/pyro.cpp
index 96fc776..eaad499 100644
--- a/src/old/pyro.cpp
+++ b/src/old/pyro.cpp
@@ -488,7 +488,7 @@ bool CPyro::Create(PyroType type, CObject* pObj, float force)
}
if ( m_type == PT_SHOTW ) return true;
-
+
// Generates the triangles of the explosion.
if ( m_type == PT_FRAGT ||
m_type == PT_FRAGO ||
@@ -1200,7 +1200,7 @@ bool CPyro::EventProcess(const Event &event)
dim.x = (Math::Rand()*2.5f+2.5f)*(1.0f-m_progress*0.9f);
dim.y = dim.x;
pos.y += dim.y;
- m_particule->CreateParticule(pos, speed, dim,
+ m_particule->CreateParticule(pos, speed, dim,
(ParticuleType)(PARTILENS1+rand()%4),
Math::Rand()*2.5f+2.5f,
Math::Rand()*5.0f+5.0f, 0.0f);
@@ -1390,7 +1390,7 @@ void CPyro::CutObjectLink(CObject* pObj)
Error CPyro::IsEnded()
{
- // Destroys the object that exploded.
+ // Destroys the object that exploded.
//It should not be destroyed at the end of the Create,
//because it is sometimes the object itself that makes the Create:
// pyro->Create(PT_FRAGT, this);