summaryrefslogtreecommitdiff
path: root/src/text.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-05 07:39:43 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-05 07:58:02 -0700
commit78ab7c7a2877efd245293ad00cd36bcaa8646507 (patch)
tree28ea749d784a3dbee334f6a076a7ac77bc0333e1 /src/text.cpp
parentb60e6d82d6e843f9e65c81555ec281d237c3ce41 (diff)
downloadmana-client-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.gz
mana-client-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.bz2
mana-client-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.xz
mana-client-78ab7c7a2877efd245293ad00cd36bcaa8646507.zip
Rename SkinLoader to Theme
Also merge the guialpha ConfigListener into Theme. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/text.cpp')
-rw-r--r--src/text.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text.cpp b/src/text.cpp
index ce09146f..f6c71dba 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -28,7 +28,7 @@
#include "gui/gui.h"
#include "gui/palette.h"
-#include "gui/skin.h"
+#include "gui/theme.h"
#include "resources/resourcemanager.h"
#include "resources/image.h"
@@ -50,7 +50,7 @@ Text::Text(const std::string &text, int x, int y,
if (textManager == 0)
{
textManager = new TextManager;
- Image *sbImage = SkinLoader::getImageFromTheme("bubble.png|W:#"
+ Image *sbImage = Theme::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);