move particles into particle dir.

26 files changed, 93 insertions, 82 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2e943111..813e23672 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -569,8 +569,8 @@ SET(SRCS
     animatedsprite.h
     animationdelayload.cpp
     animationdelayload.h
-    animationparticle.cpp
-    animationparticle.h
+    particle/animationparticle.cpp
+    particle/animationparticle.h
     auctionmanager.cpp
     auctionmanager.h
     avatar.cpp
@@ -622,8 +622,8 @@ SET(SRCS
     guild.h
     guildmanager.cpp
     guildmanager.h
-    imageparticle.cpp
-    imageparticle.h
+    particle/imageparticle.cpp
+    particle/imageparticle.h
     imagesprite.cpp
     imagesprite.h
     inventory.cpp
@@ -680,13 +680,13 @@ SET(SRCS
     notifymanager.h
     render/nullopenglgraphics.cpp
     render/nullopenglgraphics.h
-    particle.cpp
-    particle.h
-    particlecontainer.cpp
-    particlecontainer.h
-    particleemitter.cpp
-    particleemitter.h
-    particleemitterprop.h
+    particle/particle.cpp
+    particle/particle.h
+    particle/particlecontainer.cpp
+    particle/particlecontainer.h
+    particle/particleemitter.cpp
+    particle/particleemitter.h
+    particle/particleemitterprop.h
     party.cpp
     party.h
     playerinfo.cpp
@@ -696,8 +696,8 @@ SET(SRCS
     position.cpp
     position.h
     properties.h
-    rotationalparticle.cpp
-    rotationalparticle.h
+    particle/rotationalparticle.cpp
+    particle/rotationalparticle.h
     render/safeopenglgraphics.cpp
     render/safeopenglgraphics.h
     render/sdl2graphics.cpp
@@ -721,8 +721,8 @@ SET(SRCS
     text.h
     textmanager.cpp
     textmanager.h
-    textparticle.cpp
-    textparticle.h
+    particle/textparticle.cpp
+    particle/textparticle.h
     tileset.h
     touchactions.cpp
     touchactions.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d4c6779f4..252aa05f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -580,8 +580,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      animatedsprite.h \
 	      animationdelayload.cpp \
 	      animationdelayload.h \
-	      animationparticle.cpp \
-	      animationparticle.h \
+	      particle/animationparticle.cpp \
+	      particle/animationparticle.h \
 	      auctionmanager.cpp \
 	      auctionmanager.h \
 	      avatar.cpp \
@@ -633,8 +633,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      guild.h \
 	      guildmanager.cpp \
 	      guildmanager.h \
-	      imageparticle.cpp \
-	      imageparticle.h \
+	      particle/imageparticle.cpp \
+	      particle/imageparticle.h \
 	      imagesprite.cpp \
 	      imagesprite.h \
 	      inventory.cpp \
@@ -689,13 +689,13 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      notifymanager.h \
 	      render/nullopenglgraphics.cpp \
 	      render/nullopenglgraphics.h \
-	      particle.cpp \
-	      particle.h \
-	      particlecontainer.cpp \
-	      particlecontainer.h \
-	      particleemitter.cpp \
-	      particleemitter.h \
-	      particleemitterprop.h \
+	      particle/particle.cpp \
+	      particle/particle.h \
+	      particle/particlecontainer.cpp \
+	      particle/particlecontainer.h \
+	      particle/particleemitter.cpp \
+	      particle/particleemitter.h \
+	      particle/particleemitterprop.h \
 	      party.cpp \
 	      party.h \
 	      playerinfo.cpp \
@@ -705,8 +705,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      position.cpp \
 	      position.h \
 	      properties.h \
-	      rotationalparticle.cpp \
-	      rotationalparticle.h \
+	      particle/rotationalparticle.cpp \
+	      particle/rotationalparticle.h \
 	      render/safeopenglgraphics.cpp\
 	      render/safeopenglgraphics.h \
 	      render/sdl2graphics.cpp \
@@ -730,8 +730,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      text.h \
 	      textmanager.cpp \
 	      textmanager.h \
-	      textparticle.cpp \
-	      textparticle.h \
+	      particle/textparticle.cpp \
+	      particle/textparticle.h \
 	      tileset.h \
 	      touchactions.cpp \
 	      touchactions.h \
diff --git a/src/actorsprite.h b/src/actorsprite.h
index 4b2b07c52..c8b1e03df 100644
--- a/src/actorsprite.h
+++ b/src/actorsprite.h
@@ -26,7 +26,8 @@
 #include "compoundsprite.h"
 #include "localconsts.h"
 #include "map.h"
-#include "particlecontainer.h"
+
+#include "particle/particlecontainer.h"
 
 #include <SDL_types.h>
 
diff --git a/src/being.cpp b/src/being.cpp
index 8fc8003ff..535c0c0e3 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -29,13 +29,14 @@
 #include "client.h"
 #include "effectmanager.h"
 #include "guild.h"
-#include "particle.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 #include "text.h"
 
+#include "particle/particle.h"
+
 #include "gui/equipmentwindow.h"
 #include "gui/socialwindow.h"
 #include "gui/speechbubble.h"
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index f76f3ebd0..9d41ac297 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -25,9 +25,10 @@
 #include "being.h"
 #include "configuration.h"
 #include "logger.h"
-#include "particle.h"
 #include "soundmanager.h"
 
+#include "particle/particle.h"
+
 #include "debug.h"
 
 EffectManager::EffectManager() :
diff --git a/src/game.cpp b/src/game.cpp
index 258ce6e60..a900eb6ed 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -34,12 +34,13 @@
 #include "guildmanager.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
-#include "particle.h"
 #include "playerinfo.h"
 #include "soundmanager.h"
 #include "spellshortcut.h"
 #include "touchmanager.h"
 
+#include "particle/particle.h"
+
 #include "input/inputmanager.h"
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index b154a59bc..2cb633589 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -26,7 +26,8 @@
 #include "game.h"
 #include "localplayer.h"
 #include "main.h"
-#include "particle.h"
+
+#include "particle/particle.h"
 
 #include "gui/setup.h"
 #include "gui/setup_video.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 409d9de4f..02c1d6ed9 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -31,7 +31,6 @@
 #include "item.h"
 #include "maplayer.h"
 #include "party.h"
-#include "particle.h"
 #include "playerinfo.h"
 #include "playerrelations.h"
 #include "simpleanimation.h"
@@ -40,6 +39,8 @@
 #include "statuseffect.h"
 #include "walklayer.h"
 
+#include "particle/particle.h"
+
 #include "input/keyboardconfig.h"
 
 #include "gui/chatwindow.h"
diff --git a/src/map.cpp b/src/map.cpp
index f7082383b..30508e07a 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -27,11 +27,12 @@
 #include "localplayer.h"
 #include "maplayer.h"
 #include "notifymanager.h"
-#include "particle.h"
 #include "simpleanimation.h"
 #include "tileset.h"
 #include "walklayer.h"
 
+#include "particle/particle.h"
+
 #include "resources/ambientlayer.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 83576d9a2..3dee60dfa 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -31,11 +31,12 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "localplayer.h"
-#include "particle.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
 
+#include "particle/particle.h"
+
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
diff --git a/src/animationparticle.cpp b/src/particle/animationparticle.cpp
index 2c4936518..bc88e5d95 100644
--- a/src/animationparticle.cpp
+++ b/src/particle/animationparticle.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "animationparticle.h"
+#include "particle/animationparticle.h"
 
 #include "simpleanimation.h"
 
diff --git a/src/animationparticle.h b/src/particle/animationparticle.h
index 02c383fea..182bfa177 100644
--- a/src/animationparticle.h
+++ b/src/particle/animationparticle.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ANIMATIONPARTICLE_H
-#define ANIMATIONPARTICLE_H
+#ifndef PARTICLE_ANIMATIONPARTICLE_H
+#define PARTICLE_ANIMATIONPARTICLE_H
 
-#include "imageparticle.h"
+#include "particle/imageparticle.h"
 
 #include "utils/xml.h"
 
@@ -49,4 +49,4 @@ class AnimationParticle final : public ImageParticle
         SimpleAnimation *mAnimation; /**< Used animation for this particle */
 };
 
-#endif  // ANIMATIONPARTICLE_H
+#endif  // PARTICLE_ANIMATIONPARTICLE_H
diff --git a/src/imageparticle.cpp b/src/particle/imageparticle.cpp
index 52d66178c..b8fd5bc94 100644
--- a/src/imageparticle.cpp
+++ b/src/particle/imageparticle.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "imageparticle.h"
+#include "particle/imageparticle.h"
 
 #include "logger.h"
 
diff --git a/src/imageparticle.h b/src/particle/imageparticle.h
index 160567930..9217417fd 100644
--- a/src/imageparticle.h
+++ b/src/particle/imageparticle.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IMAGEPARTICLE_H
-#define IMAGEPARTICLE_H
+#ifndef PARTICLE_IMAGEPARTICLE_H
+#define PARTICLE_IMAGEPARTICLE_H
 
-#include "particle.h"
+#include "particle/particle.h"
 
 #include <map>
 
@@ -65,4 +65,4 @@ class ImageParticle : public Particle
         Image *mImage;   /**< The image used for this particle. */
 };
 
-#endif  // IMAGEPARTICLE_H
+#endif  // PARTICLE_IMAGEPARTICLE_H
diff --git a/src/particle.cpp b/src/particle/particle.cpp
index dcd9422a1..fa07fb235 100644
--- a/src/particle.cpp
+++ b/src/particle/particle.cpp
@@ -20,16 +20,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "particle.h"
+#include "particle/particle.h"
 
-#include "animationparticle.h"
 #include "configuration.h"
 #include "resources/dye.h"
 #include "logger.h"
 #include "map.h"
-#include "particleemitter.h"
-#include "rotationalparticle.h"
-#include "textparticle.h"
+
+#include "particle/animationparticle.h"
+#include "particle/particleemitter.h"
+#include "particle/rotationalparticle.h"
+#include "particle/textparticle.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/particle.h b/src/particle/particle.h
index 61e231d20..29cc7c0b4 100644
--- a/src/particle.h
+++ b/src/particle/particle.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTICLE_H
-#define PARTICLE_H
+#ifndef PARTICLE_PARTICLE_H
+#define PARTICLE_PARTICLE_H
 
 #include "actor.h"
 #include "localconsts.h"
@@ -363,4 +363,4 @@ class Particle : public Actor
 
 extern Particle *particleEngine;
 
-#endif  // PARTICLE_H
+#endif  // PARTICLE_PARTICLE_H
diff --git a/src/particlecontainer.cpp b/src/particle/particlecontainer.cpp
index a890f0d9c..1695d55f2 100644
--- a/src/particlecontainer.cpp
+++ b/src/particle/particlecontainer.cpp
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "particle.h"
-#include "particlecontainer.h"
+#include "particle/particle.h"
+#include "particle/particlecontainer.h"
 
 #include "debug.h"
 
diff --git a/src/particlecontainer.h b/src/particle/particlecontainer.h
index c78c0dbb9..a348f4cef 100644
--- a/src/particlecontainer.h
+++ b/src/particle/particlecontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTICLECONTAINER_H
-#define PARTICLECONTAINER_H
+#ifndef PARTICLE_PARTICLECONTAINER_H
+#define PARTICLE_PARTICLECONTAINER_H
 
 #include <list>
 #include <vector>
@@ -135,4 +135,4 @@ protected:
     std::vector<Particle *> mIndexedElements;
 };
 
-#endif  // PARTICLECONTAINER_H
+#endif  // PARTICLE_PARTICLECONTAINER_H
diff --git a/src/particleemitter.cpp b/src/particle/particleemitter.cpp
index 924f2094d..9e273e4a1 100644
--- a/src/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -20,11 +20,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "particleemitter.h"
+#include "particle/particleemitter.h"
 
-#include "animationparticle.h"
 #include "logger.h"
-#include "rotationalparticle.h"
+
+#include "particle/animationparticle.h"
+#include "particle/rotationalparticle.h"
 
 #include "resources/dye.h"
 #include "resources/image.h"
diff --git a/src/particleemitter.h b/src/particle/particleemitter.h
index 28b894254..415c10f37 100644
--- a/src/particleemitter.h
+++ b/src/particle/particleemitter.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTICLEEMITTER_H
-#define PARTICLEEMITTER_H
+#ifndef PARTICLE_PARTICLEEMITTER_H
+#define PARTICLE_PARTICLEEMITTER_H
 
-#include "particleemitterprop.h"
+#include "particle/particleemitterprop.h"
 
 #include "resources/animation.h"
 
@@ -164,4 +164,4 @@ class ParticleEmitter final
 
         bool mParticleFollow;
 };
-#endif  // PARTICLEEMITTER_H
+#endif  // PARTICLE_PARTICLEEMITTER_H
diff --git a/src/particleemitterprop.h b/src/particle/particleemitterprop.h
index 6196a1eca..ea241e740 100644
--- a/src/particleemitterprop.h
+++ b/src/particle/particleemitterprop.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PARTICLEEMITTERPROP_H
-#define PARTICLEEMITTERPROP_H
+#ifndef PARTICLE_PARTICLEEMITTERPROP_H
+#define PARTICLE_PARTICLEEMITTERPROP_H
 
 #include <cmath>
 #include <cstdlib>
@@ -129,4 +129,4 @@ template <typename T> struct ParticleEmitterProp final
     int changePhase;
 };
 
-#endif  // PARTICLEEMITTERPROP_H
+#endif  // PARTICLE_PARTICLEEMITTERPROP_H
diff --git a/src/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp
index af04df1e7..b72a94b3e 100644
--- a/src/rotationalparticle.cpp
+++ b/src/particle/rotationalparticle.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rotationalparticle.h"
+#include "particle/rotationalparticle.h"
 
 #include "simpleanimation.h"
 
diff --git a/src/rotationalparticle.h b/src/particle/rotationalparticle.h
index d0108e530..33289d8c3 100644
--- a/src/rotationalparticle.h
+++ b/src/particle/rotationalparticle.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ROTATIONALPARTICLE_H
-#define ROTATIONALPARTICLE_H
+#ifndef PARTICLE_ROTATIONALPARTICLE_H
+#define PARTICLE_ROTATIONALPARTICLE_H
 
-#include "imageparticle.h"
+#include "particle/imageparticle.h"
 
 #include "utils/xml.h"
 
@@ -49,4 +49,4 @@ class RotationalParticle final : public ImageParticle
         SimpleAnimation *mAnimation; /**< Used animation for this particle */
 };
 
-#endif  // ROTATIONALPARTICLE_H
+#endif  // PARTICLE_ROTATIONALPARTICLE_H
diff --git a/src/textparticle.cpp b/src/particle/textparticle.cpp
index c573ca567..ecab98068 100644
--- a/src/textparticle.cpp
+++ b/src/particle/textparticle.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "textparticle.h"
+#include "particle/textparticle.h"
 
 #include "render/graphics.h"
 
diff --git a/src/textparticle.h b/src/particle/textparticle.h
index f48a57196..a243e32e0 100644
--- a/src/textparticle.h
+++ b/src/particle/textparticle.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXTPARTICLE_H
-#define TEXTPARTICLE_H
+#ifndef PARTICLE_TEXTPARTICLE_H
+#define PARTICLE_TEXTPARTICLE_H
 
-#include "particle.h"
+#include "particle/particle.h"
 
 class TextParticle final : public Particle
 {
@@ -59,4 +59,4 @@ class TextParticle final : public Particle
         bool mOutline;                 /**< Make the text better readable */
 };
 
-#endif  // TEXTPARTICLE_H
+#endif  // PARTICLE_TEXTPARTICLE_H
diff --git a/src/statuseffect.h b/src/statuseffect.h
index 15b0bd1e1..0a38e54f6 100644
--- a/src/statuseffect.h
+++ b/src/statuseffect.h
@@ -23,9 +23,10 @@
 #ifndef STATUSEFFECT_H
 #define STATUSEFFECT_H
 
-#include "particle.h"
 #include "animatedsprite.h"
 
+#include "particle/particle.h"
+
 #include "resources/animation.h"
 
 class StatusEffect final