diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-11-01 20:04:43 +0100 |
| commit | 38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad (patch) | |
| tree | 81d0e898790264114683cca9cfd3355bea114415 /src/textparticle.cpp | |
| parent | c5e341f7b5f5e4efcabd09e00e177bb873db8097 (diff) | |
| parent | 1f69108501c4bf51f3adac9ffbf7a7631fb12b9a (diff) | |
| download | mana-client-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.gz mana-client-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.bz2 mana-client-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.tar.xz mana-client-38f7cd9a9a49dc91b1c2e69b48308bd16d4b5aad.zip | |
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
Diffstat (limited to 'src/textparticle.cpp')
| -rw-r--r-- | src/textparticle.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/textparticle.cpp b/src/textparticle.cpp index e8d99dca..0753cc38 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -44,16 +44,8 @@ bool TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const int screenX = (int) mPos.x + offsetX; int screenY = (int) mPos.y - (int) mPos.z + offsetY; - float alpha = mAlpha * 255.0f; - - if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut) - alpha = alpha * mLifetimeLeft / mFadeOut; - - if (mLifetimePast < mFadeIn) - alpha = alpha * mLifetimePast / mFadeIn; - gcn::Color color = *mColor; - color.a = (int)alpha; + color.a = getCurrentAlpha() * 255; TextRenderer::renderText(graphics, mText, screenX, screenY, gcn::Graphics::CENTER, |