diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 19:10:44 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-08 19:10:44 +0000 |
| commit | e645ad2a139c332937813dd2a1e5424ded182e26 (patch) | |
| tree | 2301eaaf164b73af148078d2ee70591cb357a6a6 /src | |
| parent | 61536d859c62518718d17e82e21b3a2459de3410 (diff) | |
| download | mana-client-e645ad2a139c332937813dd2a1e5424ded182e26.tar.gz mana-client-e645ad2a139c332937813dd2a1e5424ded182e26.tar.bz2 mana-client-e645ad2a139c332937813dd2a1e5424ded182e26.tar.xz mana-client-e645ad2a139c332937813dd2a1e5424ded182e26.zip | |
Removed some conditional code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/resources/image.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 3b860c01..5176ec7a 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -48,7 +48,8 @@ Image::Image(const std::string &idPath, GLuint glimage, int width, int height, mGLImage(glimage), mTexWidth(texWidth), mTexHeight(texHeight), - mAlpha(1.0f) + mImage(0), + mAlpha(1.0) { bounds.x = 0; bounds.y = 0; @@ -259,10 +260,6 @@ void Image::unload() { loaded = false; -#ifdef USE_OPENGL - if (mUseOpenGL) return; -#endif - if (!mImage) return; // Free the image surface. @@ -287,11 +284,9 @@ void Image::setAlpha(float a) { mAlpha = a; -#ifdef USE_OPENGL - if (mUseOpenGL) { + if (!mImage) { return; } -#endif // Set the alpha value this image is drawn at SDL_SetAlpha(mImage, SDL_SRCALPHA | SDL_RLEACCEL, (int)(255 * mAlpha)); @@ -344,14 +339,7 @@ SubImage::SubImage(Image *parent, GLuint image, SubImage::~SubImage() { -#ifdef USE_OPENGL - if (!mUseOpenGL) { - mImage = NULL; - } -#else - mImage = NULL; -#endif - + mImage = 0; // Avoid destruction of the image mParent->decRef(); } |