diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-03-26 00:10:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-03-26 13:53:30 +0300 |
commit | 35d6f9c1086d84a479bab84f07f8c9dae266f4ca (patch) | |
tree | 632b84779ac9b9ce20b60f99272f4a4c241b0b74 /src/particle | |
parent | 6e71645ebfd4cf07d86bd913b0002a3a1a33c1a9 (diff) | |
download | ManaVerse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.gz ManaVerse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.bz2 ManaVerse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.tar.xz ManaVerse-35d6f9c1086d84a479bab84f07f8c9dae266f4ca.zip |
Fix code style.
Diffstat (limited to 'src/particle')
-rw-r--r-- | src/particle/particle.cpp | 5 | ||||
-rw-r--r-- | src/particle/particle.h | 3 | ||||
-rw-r--r-- | src/particle/particleengine.cpp | 11 | ||||
-rw-r--r-- | src/particle/particleengine.h | 2 |
4 files changed, 4 insertions, 17 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index eb2456306..de85d2a59 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -22,15 +22,11 @@ #include "particle/particle.h" -#include "configuration.h" #include "logger.h" -#include "gui/viewport.h" - #include "particle/animationparticle.h" #include "particle/particleemitter.h" #include "particle/rotationalparticle.h" -#include "particle/textparticle.h" #include "resources/image.h" #include "resources/resourcemanager.h" @@ -51,7 +47,6 @@ static const double PI = M_PI; static const float PI2 = 2 * M_PI; class Graphics; -class Image; Particle::Particle() : Actor(), diff --git a/src/particle/particle.h b/src/particle/particle.h index c0e149c97..d73de5dcc 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -32,10 +32,7 @@ #include "localconsts.h" -class Color; -class Font; class Image; -class Particle; class ParticleEmitter; class SimpleAnimation; diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp index d03d7c512..2f82e7704 100644 --- a/src/particle/particleengine.cpp +++ b/src/particle/particleengine.cpp @@ -20,10 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "particle/particle.h" - #include "configuration.h" -#include "logger.h" #include "gui/viewport.h" @@ -37,13 +34,11 @@ #include "resources/dye/dye.h" #include "utils/dtor.h" -#include "utils/mathutils.h" #include "debug.h" ParticleEngine *particleEngine = nullptr; -class Graphics; class Image; int ParticleEngine::particleCount = 0; @@ -72,7 +67,8 @@ void ParticleEngine::setupEngine() restrict2 { ParticleEngine::maxCount = config.getIntValue("particleMaxCount"); ParticleEngine::fastPhysics = config.getIntValue("particleFastPhysics"); - ParticleEngine::emitterSkip = config.getIntValue("particleEmitterSkip") + 1; + ParticleEngine::emitterSkip = + config.getIntValue("particleEmitterSkip") + 1; if (!ParticleEngine::emitterSkip) ParticleEngine::emitterSkip = 1; ParticleEngine::enabled = config.getBoolValue("particleeffects"); @@ -306,7 +302,8 @@ Particle *ParticleEngine::addTextRiseFadeOutEffect(const std::string &restrict const Color *restrict const color, Font *restrict const font, - const bool outline) restrict2 + const bool outline) + restrict2 { Particle *const newParticle = new TextParticle( text, diff --git a/src/particle/particleengine.h b/src/particle/particleengine.h index 59c20e7e5..55c224414 100644 --- a/src/particle/particleengine.h +++ b/src/particle/particleengine.h @@ -23,8 +23,6 @@ #ifndef PARTICLE_PARTICLEENGINE_H #define PARTICLE_PARTICLEENGINE_H -#include "enums/particle/alivestatus.h" - #include <list> #include <string> |