diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
| commit | e3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch) | |
| tree | 494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/resources/image.cpp | |
| parent | 703a3c4df3732e3e88559147001260f3355d42d6 (diff) | |
| download | manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2 manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip | |
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/resources/image.cpp')
| -rw-r--r-- | src/resources/image.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index e28cb2bc5..8f5ee1d2d 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -49,12 +49,12 @@ int Image::mTextureSize = 0; bool Image::mEnableAlphaCache = false; bool Image::mEnableAlpha = true; -Image::Image(SDL_Surface *image, bool hasAlphaChannel, Uint8 *alphaChannel): +Image::Image(SDL_Surface *image, bool hasAlphaChannel0, Uint8 *alphaChannel): mAlpha(1.0f), - mHasAlphaChannel(hasAlphaChannel), + mHasAlphaChannel(hasAlphaChannel0), mSDLSurface(image), mAlphaChannel(alphaChannel), - mIsAlphaVisible(hasAlphaChannel), + mIsAlphaVisible(hasAlphaChannel0), mIsAlphaCalculated(false) { #ifdef USE_OPENGL |