diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 19:23:25 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 19:23:25 -0600 |
| commit | 75ba2b04b8af02ba2e005f701f1433e739ef7c5a (patch) | |
| tree | 562cb91059f0e53a780457354163214f54f3b758 /src/resources | |
| parent | f46cfb91278b27f4943f5512778129fe985c678e (diff) | |
| download | mana-75ba2b04b8af02ba2e005f701f1433e739ef7c5a.tar.gz mana-75ba2b04b8af02ba2e005f701f1433e739ef7c5a.tar.bz2 mana-75ba2b04b8af02ba2e005f701f1433e739ef7c5a.tar.xz mana-75ba2b04b8af02ba2e005f701f1433e739ef7c5a.zip | |
Fix compile errors
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 1689aa1d..b08478b5 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -35,12 +35,12 @@ int Image::mTextureSize = 0; #endif Image::Image(SDL_Surface *image): -#ifdef USE_OPENGL - mGLImage(0), -#endif mAlpha(1.0f), mAlphaChannel(0), - mSDLSurface(image) + mSDLSurface(image), +#ifdef USE_OPENGL + mGLImage(0) +#endif { mBounds.x = 0; mBounds.y = 0; @@ -62,13 +62,13 @@ Image::Image(SDL_Surface *image): #ifdef USE_OPENGL Image::Image(GLuint glimage, int width, int height, int texWidth, int texHeight): - mGLImage(glimage), - mTexWidth(texWidth), - mTexHeight(texHeight), mAlpha(1.0), mHasAlphaChannel(true), mAlphaChannel(0), - mSDLSurface(0) + mSDLSurface(0), + mGLImage(glimage), + mTexWidth(texWidth), + mTexHeight(texHeight) { mBounds.x = 0; mBounds.y = 0; @@ -416,6 +416,8 @@ Uint8 *Image::_SDLgetAlphaChannel() mAlphaChannel[i] = a; } } + + return mAlphaChannel; } #ifdef USE_OPENGL |