diff options
| author | Majin Sniper <majinsniper@gmx.de> | 2009-03-12 22:42:42 +0100 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-12 19:38:55 -0600 |
| commit | 3b1fbbe072e4da86be4c8f8f22655d04565379d2 (patch) | |
| tree | 9bae46138230c01fd2998395e146556f9a9db05b /src/monster.cpp | |
| parent | b9191530c81595b0ad3d2faa6c4d21d75a720c29 (diff) | |
| download | mana-3b1fbbe072e4da86be4c8f8f22655d04565379d2.tar.gz mana-3b1fbbe072e4da86be4c8f8f22655d04565379d2.tar.bz2 mana-3b1fbbe072e4da86be4c8f8f22655d04565379d2.tar.xz mana-3b1fbbe072e4da86be4c8f8f22655d04565379d2.zip | |
Make use of the new available colors
This patch lets all being derivatives use the palette to set their
name's colors. Text Particle Effects all respect the new settings. Some
widgets were updated to use the colors.
Diffstat (limited to 'src/monster.cpp')
| -rw-r--r-- | src/monster.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/monster.cpp b/src/monster.cpp index 89d0953d..7dc08238 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -27,6 +27,8 @@ #include "sound.h" #include "text.h" +#include "gui/palette.h" + #include "resources/monsterdb.h" #include "resources/monsterinfo.h" @@ -71,7 +73,7 @@ Monster::Monster(int id, Uint16 job, Map *map): } } - mNameColor = 0xff2020; + mNameColor = &guiPalette->getColor(Palette::MONSTER); } Monster::~Monster() @@ -195,7 +197,8 @@ void Monster::showName(bool show) { mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET - getHeight(), - gcn::Graphics::CENTER, gcn::Color(255, 64, 64)); + gcn::Graphics::CENTER, + &guiPalette->getColor(Palette::MONSTER)); } else { |