Merge branch 'aethyra/master'

Conflicts:
	src/being.cpp
	src/being.h
	src/floor_item.cpp
	src/floor_item.h
	src/flooritemmanager.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/popupmenu.cpp
	src/net/beinghandler.cpp
	src/npc.cpp

1 files changed, 24 insertions, 0 deletions

diff --git a/src/player.cpp b/src/player.cpp
index f620e637..e1928280 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -21,6 +21,7 @@
 
 #include "animatedsprite.h"
 #include "game.h"
+#include "particle.h"
 #include "player.h"
 #include "text.h"
 
@@ -90,7 +91,10 @@ void Player::logic()
             break;
 
         case ATTACK:
+            int rotation = 0;
+            std::string particleEffect = "";
             int frames = 4;
+
             if (mEquippedWeapon &&
                 mEquippedWeapon->getAttackType() == ACTION_ATTACK_BOW)
             {
@@ -99,6 +103,26 @@ void Player::logic()
 
             mFrame = (get_elapsed_time(mWalkTime) * frames) / mAttackSpeed;
 
+            //attack particle effect
+            if (mEquippedWeapon)
+                particleEffect = mEquippedWeapon->getParticleEffect();
+
+            if (!particleEffect.empty() && mParticleEffects && mFrame == 1)
+            {
+                switch (mDirection)
+                {
+                    case DOWN: rotation = 0; break;
+                    case LEFT: rotation = 90; break;
+                    case UP: rotation = 180; break;
+                    case RIGHT: rotation = 270; break;
+                    default: break;
+                }
+                Particle *p;
+                p = particleEngine->addEffect("graphics/particles/" +
+                                              particleEffect, 0, 0, rotation);
+                controlParticle(p);
+            }
+
             if (mFrame >= frames)
                 nextStep();