diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
commit | 35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch) | |
tree | 2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/graphics.cpp | |
parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
download | manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz manaplus-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip |
some other fixes from cpplint.
Diffstat (limited to 'src/graphics.cpp')
-rw-r--r-- | src/graphics.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 7e704c615..8f6b805cd 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -403,10 +403,10 @@ bool Graphics::drawRescaledImage(const Image *const image, int srcX, int srcY, SDL_Rect dstRect; SDL_Rect srcRect; - dstRect.x = static_cast<short>(dstX); - dstRect.y = static_cast<short>(dstY); - srcRect.x = static_cast<short>(srcX); - srcRect.y = static_cast<short>(srcY); + dstRect.x = static_cast<int16_t>(dstX); + dstRect.y = static_cast<int16_t>(dstY); + srcRect.x = static_cast<int16_t>(srcX); + srcRect.y = static_cast<int16_t>(srcY); srcRect.w = static_cast<uint16_t>(width); srcRect.h = static_cast<uint16_t>(height); @@ -435,10 +435,10 @@ bool Graphics::drawImage2(const Image *const image, int srcX, int srcY, SDL_Rect dstRect; SDL_Rect srcRect; - dstRect.x = static_cast<short>(dstX); - dstRect.y = static_cast<short>(dstY); - srcRect.x = static_cast<short>(srcX); - srcRect.y = static_cast<short>(srcY); + dstRect.x = static_cast<int16_t>(dstX); + dstRect.y = static_cast<int16_t>(dstY); + srcRect.x = static_cast<int16_t>(srcX); + srcRect.y = static_cast<int16_t>(srcY); srcRect.w = static_cast<uint16_t>(width); srcRect.h = static_cast<uint16_t>(height); @@ -485,10 +485,10 @@ void Graphics::drawImagePattern(const Image *const image, SDL_Rect dstRect; SDL_Rect srcRect; - dstRect.x = static_cast<short>(dstX); - dstRect.y = static_cast<short>(dstY); - srcRect.x = static_cast<short>(srcX); - srcRect.y = static_cast<short>(srcY); + dstRect.x = static_cast<int16_t>(dstX); + dstRect.y = static_cast<int16_t>(dstY); + srcRect.x = static_cast<int16_t>(srcX); + srcRect.y = static_cast<int16_t>(srcY); srcRect.w = static_cast<uint16_t>(dw); srcRect.h = static_cast<uint16_t>(dh); @@ -537,10 +537,10 @@ void Graphics::drawRescaledImagePattern(const Image *const image, SDL_Rect dstRect; SDL_Rect srcRect; - dstRect.x = static_cast<short>(dstX); - dstRect.y = static_cast<short>(dstY); - srcRect.x = static_cast<short>(srcX); - srcRect.y = static_cast<short>(srcY); + dstRect.x = static_cast<int16_t>(dstX); + dstRect.y = static_cast<int16_t>(dstY); + srcRect.x = static_cast<int16_t>(srcX); + srcRect.y = static_cast<int16_t>(srcY); srcRect.w = static_cast<uint16_t>(dw); srcRect.h = static_cast<uint16_t>(dh); @@ -702,10 +702,10 @@ void Graphics::calcImagePattern(ImageVertexes* const vert, DoubleRect *const r = new DoubleRect(); SDL_Rect &dstRect = r->dst; SDL_Rect &srcRect = r->src; - dstRect.x = static_cast<short>(dstX); - dstRect.y = static_cast<short>(dstY); - srcRect.x = static_cast<short>(srcX); - srcRect.y = static_cast<short>(srcY); + dstRect.x = static_cast<int16_t>(dstX); + dstRect.y = static_cast<int16_t>(dstY); + srcRect.x = static_cast<int16_t>(srcX); + srcRect.y = static_cast<int16_t>(srcY); srcRect.w = static_cast<uint16_t>(dw); srcRect.h = static_cast<uint16_t>(dh); @@ -804,10 +804,10 @@ void Graphics::calcTile(ImageVertexes *const vert, int x, int y) const DoubleRect *rect = new DoubleRect(); - rect->dst.x = static_cast<short>(x); - rect->dst.y = static_cast<short>(y); - rect->src.x = static_cast<short>(image->mBounds.x); - rect->src.y = static_cast<short>(image->mBounds.y); + rect->dst.x = static_cast<int16_t>(x); + rect->dst.y = static_cast<int16_t>(y); + rect->src.x = static_cast<int16_t>(image->mBounds.x); + rect->src.y = static_cast<int16_t>(image->mBounds.y); rect->src.w = static_cast<uint16_t>(image->mBounds.w); rect->src.h = static_cast<uint16_t>(image->mBounds.h); if (SDL_FakeUpperBlit(image->mSDLSurface, &rect->src, |