summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/particle/particle.cpp62
-rw-r--r--src/particle/particle.h26
2 files changed, 0 insertions, 88 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 8f0cb1e41..0cc97eb53 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -293,14 +293,6 @@ void Particle::moveTo(const float x, const float y) restrict2
moveTo(Vector(x, y, mPos.z));
}
-Particle *Particle::createChild() restrict2
-{
- Particle *const newParticle = new Particle();
- newParticle->setMap(mMap);
- mChildParticles.push_back(newParticle);
- return newParticle;
-}
-
Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
const int pixelX, const int pixelY,
const int rotation) restrict2
@@ -440,60 +432,6 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
return newParticle;
}
-Particle *Particle::addTextSplashEffect(const std::string &restrict text,
- const int x, const int y,
- const Color *restrict const color,
- Font *restrict const font,
- const bool outline) restrict2
-{
- Particle *const newParticle = new TextParticle(
- text,
- color,
- font,
- outline);
- newParticle->setMap(mMap);
- newParticle->moveTo(static_cast<float>(x),
- static_cast<float>(y));
- newParticle->setVelocity(
- static_cast<float>((rand() % 100) - 50) / 200.0F, // X
- static_cast<float>((rand() % 100) - 50) / 200.0F, // Y
- (static_cast<float>((rand() % 100)) / 200.0F) + 4.0F); // Z
-
- newParticle->setGravity(0.1F);
- newParticle->setBounce(0.5F);
- newParticle->setLifetime(200);
- newParticle->setFadeOut(100);
-
- mChildParticles.push_back(newParticle);
-
- return newParticle;
-}
-
-Particle *Particle::addTextRiseFadeOutEffect(const std::string &restrict text,
- const int x, const int y,
- const Color *restrict const color,
- Font *restrict const font,
- const bool outline) restrict2
-{
- Particle *const newParticle = new TextParticle(
- text,
- color,
- font,
- outline);
- newParticle->setMap(mMap);
- newParticle->moveTo(static_cast<float>(x),
- static_cast<float>(y));
- newParticle->setVelocity(0.0F, 0.0F, 0.5F);
- newParticle->setGravity(0.0015F);
- newParticle->setLifetime(300);
- newParticle->setFadeOut(100);
- newParticle->setFadeIn(0);
-
- mChildParticles.push_back(newParticle);
-
- return newParticle;
-}
-
void Particle::adjustEmitterSize(const int w, const int h) restrict2
{
if (mAllowSizeAdjust)
diff --git a/src/particle/particle.h b/src/particle/particle.h
index 01fea38e0..e5e61361a 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -85,12 +85,6 @@ class Particle notfinal : public Actor
{ return CAST_S32(mPos.y) - 16; }
/**
- * Creates a blank particle as a child of the current particle
- * Useful for creating target particles
- */
- Particle *createChild() restrict2;
-
- /**
* Creates a child particle that hosts some emitters described in the
* particleEffectFile.
*/
@@ -99,26 +93,6 @@ class Particle notfinal : public Actor
const int rotation = 0) restrict2;
/**
- * Creates a standalone text particle.
- */
- Particle *addTextSplashEffect(const std::string &restrict text,
- const int x, const int y,
- const Color *restrict const color,
- Font *restrict const font,
- const bool outline = false)
- restrict2 A_NONNULL(5, 6);
-
- /**
- * Creates a standalone text particle.
- */
- Particle *addTextRiseFadeOutEffect(const std::string &restrict text,
- const int x, const int y,
- const Color *restrict const color,
- Font *restrict const font,
- const bool outline = false)
- restrict2 A_NONNULL(5, 6);
-
- /**
* Adds an emitter to the particle.
*/
void addEmitter(ParticleEmitter *const emitter) restrict2 A_NONNULL(2)