diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/particlecontainer.h | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | Mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz Mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 Mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz Mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/particlecontainer.h')
| -rw-r--r-- | src/particlecontainer.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 27e02f8b..26539dd7 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -25,8 +25,7 @@ #include <list> #include <vector> -#include "particle.h" - +class Particle; /** * Set of particle effects. May be stacked with other ParticleContainers. All @@ -65,8 +64,6 @@ protected: ParticleContainer *mNext; /**< Contained container, if any */ }; - - /** * Linked list of particle effects. */ @@ -94,7 +91,6 @@ protected: std::list<Particle *> mElements; /**< Contained particle effects */ }; - /** * Particle container with indexing facilities */ |