Merge branch '0.5' of gitorious.org:mana/mana

Conflicts:
	src/being.cpp
	src/client.cpp
	src/commandhandler.cpp
	src/gui/setup_video.cpp
	src/gui/socialwindow.cpp
	src/gui/viewport.cpp
	src/gui/widgets/browserbox.cpp
	src/gui/widgets/itemcontainer.cpp
	src/imageparticle.cpp
	src/localplayer.cpp
	src/localplayer.h
	src/map.cpp
	src/net/tmwa/beinghandler.cpp
	src/particle.cpp
	src/particle.h
	src/player.cpp
	src/player.h

1 files changed, 5 insertions, 13 deletions

diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
index 2900239f..b7d92277 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -48,20 +48,12 @@ bool ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     int screenY = (int) mPos.y - (int)mPos.z + offsetY - mImage->getHeight()/2;
 
     // Check if on screen
-    if (screenX + mImage->getWidth() < 0 ||
-            screenX > graphics->getWidth() ||
-            screenY + mImage->getHeight() < 0 ||
-            screenY > graphics->getHeight())
+    if (screenX + mImage->getWidth() < 0
+        || screenX > graphics->getWidth()
+        || screenY + mImage->getHeight() < 0
+        || screenY > graphics->getHeight())
         return false;
 
-    float alphafactor = mAlpha;
-
-    if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
-        alphafactor *= (float) mLifetimeLeft / (float) mFadeOut;
-
-    if (mLifetimePast < mFadeIn)
-        alphafactor *= (float) mLifetimePast / (float) mFadeIn;
-
-    mImage->setAlpha(alphafactor);
+    mImage->setAlpha(getCurrentAlpha());
     return graphics->drawImage(mImage, screenX, screenY);
 }