diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-10-26 15:41:57 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-10-26 15:41:57 +0000 |
| commit | 3925d9c41709dece19fe60c0e4bb111247f1886e (patch) | |
| tree | 9b46a1ed60547c4e3f075536a50faa5342cbbc28 /src/textparticle.cpp | |
| parent | 6d426d55fed55f2c01bdafca348cc8bbb06ee063 (diff) | |
| download | mana-client-3925d9c41709dece19fe60c0e4bb111247f1886e.tar.gz mana-client-3925d9c41709dece19fe60c0e4bb111247f1886e.tar.bz2 mana-client-3925d9c41709dece19fe60c0e4bb111247f1886e.tar.xz mana-client-3925d9c41709dece19fe60c0e4bb111247f1886e.zip | |
Merged revisions 4302,4338,4360-4362,4526,4528,4534,4547 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r4302 | crush_tmw | 2008-05-28 18:51:26 +0200 (Wed, 28 May 2008) | 1 line
Changed the way particle emitter skip is handled to make linear and circular emitters work with particleEmitterSkip enabled.
........
r4338 | crush_tmw | 2008-06-05 20:41:39 +0200 (Thu, 05 Jun 2008) | 1 line
Lowered default particle detail level.
........
r4360 | crush_tmw | 2008-06-23 16:44:20 +0200 (Mon, 23 Jun 2008) | 1 line
Implemented "alpha" particle property.
........
r4361 | crush_tmw | 2008-06-23 22:20:05 +0200 (Mon, 23 Jun 2008) | 1 line
Forgot changelog with last commit.
........
r4362 | crush_tmw | 2008-06-24 14:29:33 +0200 (Tue, 24 Jun 2008) | 1 line
Added particle property "follow-parent" which makes the particle move when its parent particle is moved.
........
r4526 | crush_tmw | 2008-08-24 20:52:00 +0200 (Sun, 24 Aug 2008) | 1 line
Added new particle emitter property "output-pause" which allows to define a fixed (or random) interval between two outputs.
........
r4528 | crush_tmw | 2008-08-24 20:58:39 +0200 (Sun, 24 Aug 2008) | 1 line
fix for an error in the last commit
........
r4534 | b_lindeijer | 2008-08-27 20:48:13 +0200 (Wed, 27 Aug 2008) | 3 lines
Renamed "randomnes" to "randomness", so that it won't show up as part of Fate's
patch.
........
r4547 | crush_tmw | 2008-08-29 00:44:43 +0200 (Fri, 29 Aug 2008) | 1 line
Added output-pause to copy constructor of particle emitters.
........
Diffstat (limited to 'src/textparticle.cpp')
| -rw-r--r-- | src/textparticle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textparticle.cpp b/src/textparticle.cpp index 4bc859cd..89466006 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -45,7 +45,7 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const int screenX = (int) mPos.x + offsetX; int screenY = (int) mPos.y - (int) mPos.z + offsetY; - int alpha = 255; + float alpha = mAlpha * 255.0f; if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut) { @@ -60,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, (int)alpha)); graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER); } |