diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
| commit | 1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9 (patch) | |
| tree | 596305e9bfd4ad8448efd477a43f86490b1974c5 /src/text.cpp | |
| parent | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (diff) | |
| parent | f5f7a7d5990d1133f714b6cd431aecf6a332fbd5 (diff) | |
| download | mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.gz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.bz2 mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.xz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text.cpp b/src/text.cpp index 0b6b77ea..ce09146f 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -28,6 +28,7 @@ #include "gui/gui.h" #include "gui/palette.h" +#include "gui/skin.h" #include "resources/resourcemanager.h" #include "resources/image.h" @@ -49,8 +50,7 @@ Text::Text(const std::string &text, int x, int y, if (textManager == 0) { textManager = new TextManager; - ResourceManager *resman = ResourceManager::getInstance(); - Image *sbImage = resman->getImage("graphics/gui/bubble.png|W:#" + Image *sbImage = SkinLoader::getImageFromTheme("bubble.png|W:#" + config.getValue("speechBubblecolor", "000000")); mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5); mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5); |