Merged 0.0 changes from revision 3362 to 3580 to trunk.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index dd01d2fe..4bc859cd 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -26,7 +26,8 @@
 #include "graphics.h"
 
 TextParticle::TextParticle(Map *map, const std::string &text,
-        int colorR, int colorG, int colorB, gcn::Font *font):
+                           int colorR, int colorG, int colorB,
+                           gcn::Font *font):
     Particle(map),
     mText(text),
     mTextFont(font),
@@ -41,8 +42,8 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     if (!mAlive)
         return;
 
-    int screenX = (int)mPosX + offsetX;
-    int screenY = (int)mPosY - int(mPosZ) + offsetY;
+    int screenX = (int) mPos.x + offsetX;
+    int screenY = (int) mPos.y - (int) mPos.z + offsetY;
 
     int alpha = 255;
 
@@ -50,7 +51,7 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     {
         alpha *= mLifetimeLeft;
         alpha /= mFadeOut;
-    };
+    }
 
     if (mLifetimePast < mFadeIn)
     {
@@ -59,6 +60,6 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     }
 
     graphics->setFont(mTextFont);
-    graphics->setColor(gcn::Color (mColorR, mColorG, mColorB, alpha));
+    graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, alpha));
     graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
 }