summaryrefslogtreecommitdiff
path: root/src/resources/image.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/image.cpp')
-rw-r--r--src/resources/image.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index c05b03aa..e643143b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -45,20 +45,14 @@ bool Image::mDisableTransparency = false;
SDL_Renderer *Image::mRenderer;
Image::Image(SDL_Texture *texture, int width, int height):
- mAlpha(1.0f),
+ mLoaded(texture != nullptr),
mTexture(texture)
{
-#ifdef USE_OPENGL
- mGLImage = 0;
-#endif
-
mBounds.x = 0;
mBounds.y = 0;
mBounds.w = width;
mBounds.h = height;
- mLoaded = mTexture != nullptr;
-
if (!mLoaded)
{
logger->log(
@@ -68,8 +62,7 @@ Image::Image(SDL_Texture *texture, int width, int height):
#ifdef USE_OPENGL
Image::Image(GLuint glimage, int width, int height, int texWidth, int texHeight):
- mAlpha(1.0f),
- mTexture(nullptr),
+ mLoaded(glimage != 0),
mGLImage(glimage),
mTexWidth(texWidth),
mTexHeight(texHeight)
@@ -79,13 +72,10 @@ Image::Image(GLuint glimage, int width, int height, int texWidth, int texHeight)
mBounds.w = width;
mBounds.h = height;
- if (mGLImage)
- mLoaded = true;
- else
+ if (!mLoaded)
{
logger->log(
- "Image::Image(GLuint*, ...): Couldn't load invalid Surface!");
- mLoaded = false;
+ "Image::Image(GLuint, ...): Couldn't load invalid Surface!");
}
}
#endif