summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-12-23 01:46:27 +0300
committerAndrei Karas <akaras@inbox.ru>2011-12-23 01:46:27 +0300
commit7cff9f7777dcfdaae8cc7b982740131d80ba75c1 (patch)
treefd8ca1c73df99abb881f4b8fed595a367d6652be /src/resources
parenta901facc32f489dbce6f9193f618d9d46a91f32c (diff)
downloadmv-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.gz
mv-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.bz2
mv-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.tar.xz
mv-7cff9f7777dcfdaae8cc7b982740131d80ba75c1.zip
Fix code style and some auto checked errors.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index df07c16a2..4cdcdb001 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -473,10 +473,10 @@ Image* Image::SDLmerge(Image *image, int x, int y)
static_cast<Uint16>(mBounds.h - y));
// for each pixel lines of a source image
- for (offset_x = (x > 0 ? 0 : -x); offset_x < maxX; offset_x++)
+ for (offset_x = ((x > 0) ? 0 : -x); offset_x < maxX; offset_x++)
{
const int x1 = x0 + offset_x;
- for (offset_y = (y > 0 ? 0 : -y); offset_y < maxY; offset_y++)
+ for (offset_y = ((y > 0) ? 0 : -y); offset_y < maxY; offset_y++)
{
// Computing offset on both images
current_offset = (offset_y * getWidth()) + x1;