summaryrefslogtreecommitdiff
path: root/src/particle.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-10-27 04:23:43 +0000
committerIra Rice <irarice@gmail.com>2008-10-27 04:23:43 +0000
commit218ad29dc13b1b89da9804dec15f32692d8709d6 (patch)
treee1547d951089109de83833fb2a29067fc11eee8c /src/particle.cpp
parent8119f4ec53b64adc427f683077f65ce8aec85582 (diff)
downloadmana-218ad29dc13b1b89da9804dec15f32692d8709d6.tar.gz
mana-218ad29dc13b1b89da9804dec15f32692d8709d6.tar.bz2
mana-218ad29dc13b1b89da9804dec15f32692d8709d6.tar.xz
mana-218ad29dc13b1b89da9804dec15f32692d8709d6.zip
Made targets draw on the fringe layer, as well as added t for talking to
an NPC, n for targeting an NPC, and changed basic targeting code so that it'll time out after being on a target for longer than a minute.
Diffstat (limited to 'src/particle.cpp')
-rw-r--r--src/particle.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index b7071674..af54a4b5 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -360,11 +360,9 @@ Particle::~Particle()
void
Particle::clear()
{
- std::for_each(mChildEmitters.begin(), mChildEmitters.end(),
- make_dtor(mChildEmitters));
+ delete_all(mChildEmitters);
mChildEmitters.clear();
- std::for_each(mChildParticles.begin(), mChildParticles.end(),
- make_dtor(mChildParticles));
+ delete_all(mChildParticles);
mChildParticles.clear();
}