diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-06-09 22:46:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-06-09 23:50:09 +0300 |
| commit | ff11053f5f638749c3564c464dc41ebc474b4897 (patch) | |
| tree | 8cf7ed8485528c7498612199c7ca56a6fd84f5e5 /src/client.cpp | |
| parent | b2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f (diff) | |
| download | manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.gz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.bz2 manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.tar.xz manaplus-ff11053f5f638749c3564c464dc41ebc474b4897.zip | |
Move static methods from Image class to ImageHelper class.
Remove SDL merge method. It was very slow and unused.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp index 95317f682..35658f0f9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -85,6 +85,7 @@ #include "resources/colordb.h" #include "resources/emotedb.h" #include "resources/image.h" +#include "resources/imagehelper.h" #include "resources/itemdb.h" #include "resources/mapdb.h" #include "resources/monsterdb.h" @@ -397,14 +398,14 @@ void Client::gameInit() } #if defined USE_OPENGL - Image::setBlur(config.getBoolValue("blur")); - Image::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache") + ImageHelper::setBlur(config.getBoolValue("blur")); + ImageHelper::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache") && !config.getIntValue("opengl")); - Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f + ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f || config.getIntValue("opengl")); #else - Image::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache")); - Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f); + ImageHelper::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache")); + ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f); #endif resman->addToSearchPath(PKG_DATADIR "data/perserver/default", false); @@ -1504,7 +1505,7 @@ void Client::optionChanged(const std::string &name) else if (name == "guialpha") { setGuiAlpha(config.getFloatValue("guialpha")); - Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f); + ImageHelper::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f); } else if (name == "gamma") { |