diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
| commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
| tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/localplayer.cpp | |
| parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
| parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
| download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 8c918a97..a48c7f4c 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -43,9 +43,9 @@ #include "gui/ministatus.h" #include "gui/palette.h" #include "gui/skilldialog.h" -#include "gui/skin.h" #include "gui/statuswindow.h" #include "gui/storagewindow.h" +#include "gui/theme.h" #include "gui/widgets/chattab.h" @@ -1061,8 +1061,8 @@ void LocalPlayer::loadTargetCursor(const std::string &filename, assert(size > -1); assert(size < 3); - ImageSet *currentImageSet = SkinLoader::getImageSetFromTheme(filename, - width, height); + ImageSet *currentImageSet = Theme::getImageSetFromTheme(filename, + width, height); Animation *anim = new Animation; for (unsigned int i = 0; i < currentImageSet->size(); ++i) |