From 781b3c9f17708cc5fe08eb3c9ee38d596364d97c Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 4 Mar 2010 22:41:19 -0700 Subject: Split Palette into Theme and UserPalette MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Themes can now control the colors they use. Colors in the Viewport (being names, particles, etc) can still be changed by the user. Also make ProgressBars more easily colored. DyePalette was made more flexible in the process. Also fixes comparing strings of different lengths insensitively. Reviewed-by: Thorbjørn Lindeijer --- src/npc.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/npc.cpp') diff --git a/src/npc.cpp b/src/npc.cpp index 38aecab8..29a6c61c 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -29,7 +29,7 @@ #include "gui/buysell.h" #include "gui/npcdialog.h" #include "gui/npcpostdialog.h" -#include "gui/palette.h" +#include "gui/userpalette.h" #include "gui/sell.h" #include "net/net.h" @@ -74,6 +74,10 @@ void NPC::setName(const std::string &name) const std::string displayName = name.substr(0, name.find('#', 0)); Being::setName(displayName); + + mNameColor = &userPalette->getColor(UserPalette::NPC); + + mDispName->setColor(mNameColor); } void NPC::talk() -- cgit v1.2.3-60-g2f50