diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-25 03:56:27 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-25 03:56:27 +0100 |
| commit | 17d2756975a8ff22ecba92c055fa7a7f77d425c6 (patch) | |
| tree | 76aaa104da3ee97b07aec7f2d972f8b8d6239d9a /src/npc.cpp | |
| parent | 7e928fc6559e89b64f49aea30d796dbfe75c4912 (diff) | |
| parent | 61040888a373b03cc599750c33186848cae37ef4 (diff) | |
| download | mana-client-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.gz mana-client-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.bz2 mana-client-17d2756975a8ff22ecba92c055fa7a7f77d425c6.tar.xz mana-client-17d2756975a8ff22ecba92c055fa7a7f77d425c6.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/npc.cpp')
| -rw-r--r-- | src/npc.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 3de1228f..aed6d87b 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -30,8 +30,6 @@ #include "net/protocol.h" #include "resources/npcdb.h" -#include "gui/gui.h" - NPC *current_npc = 0; static const int NAME_X_OFFSET = 15; @@ -76,7 +74,7 @@ void NPC::setName(const std::string &name) { delete mName; mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, speechFont, + gcn::Graphics::CENTER, gcn::Color(200, 200, 255)); } |