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/npc.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/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 5a4f9507..630316e0 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -26,6 +26,7 @@ #include "text.h" #include "gui/npc_text.h" +#include "gui/palette.h" #include "net/messageout.h" #include "net/protocol.h" @@ -71,7 +72,7 @@ NPC::NPC(int id, Uint16 job, Map *map, Network *network): } mName = 0; - mNameColor = 0x21bbbb; + mNameColor = &guiPalette->getColor(Palette::NPC); } NPC::~NPC() @@ -85,7 +86,8 @@ void NPC::setName(const std::string &name) delete mName; mName = new Text(displayName, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, gcn::Color(200, 200, 255)); + gcn::Graphics::CENTER, + &guiPalette->getColor(Palette::NPC)); Being::setName(displayName + " (NPC)"); } |