diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-25 18:45:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-25 18:45:25 +0300 |
| commit | 190d4073c1c2345cc96cece3099a5e58b434ebb7 (patch) | |
| tree | 41660b0f3919d967cdd2df1bcf07971063ec29a9 /src/gui/sdlfont.cpp | |
| parent | 71f88c02f79a1164430eec1de3e15edec011a15e (diff) | |
| download | manaverse-190d4073c1c2345cc96cece3099a5e58b434ebb7.tar.gz manaverse-190d4073c1c2345cc96cece3099a5e58b434ebb7.tar.bz2 manaverse-190d4073c1c2345cc96cece3099a5e58b434ebb7.tar.xz manaverse-190d4073c1c2345cc96cece3099a5e58b434ebb7.zip | |
fix compilation varnings
Diffstat (limited to 'src/gui/sdlfont.cpp')
| -rw-r--r-- | src/gui/sdlfont.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 5e859be53..749a36b4e 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -31,7 +31,7 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" +//#include "resources/resourcemanager.h" #include "resources/surfaceimagehelper.h" #include "utils/paths.h" @@ -344,8 +344,6 @@ SDLFont::SDLFont(std::string filename, mDeleteCounter(0), mCleanTime(cur_time + CLEAN_TIME) { - const ResourceManager *const resman = ResourceManager::getInstance(); - if (fontCounter == 0) { mSoftMode = imageHelper->useOpenGL() == RENDER_SOFTWARE; @@ -399,7 +397,6 @@ SDLFont::~SDLFont() TTF_Font *SDLFont::openFont(const char *const name, const int size) { logger->log("font to open: %s", name); - ResourceManager *const resman = ResourceManager::getInstance(); SDL_RWops *const rw = MPHYSFSRWOPS_openRead(name); if (!rw) return nullptr; @@ -410,8 +407,6 @@ void SDLFont::loadFont(std::string filename, const int size, const int style) { - const ResourceManager *const resman = ResourceManager::getInstance(); - if (fontCounter == 0 && TTF_Init() == -1) { logger->log("Unable to initialize SDL_ttf: " + |