diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-06-05 00:35:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-06-05 00:35:30 +0300 |
commit | c3afff20d4989ab2835545715bbe67e5b5d9b353 (patch) | |
tree | 21d4d8c51ff0afa1c4b87fd83af1f6a6c4d64ce4 /src | |
parent | c0826c48402594d86f8f75db96b54c58ce00968d (diff) | |
download | manaplus-c3afff20d4989ab2835545715bbe67e5b5d9b353.tar.gz manaplus-c3afff20d4989ab2835545715bbe67e5b5d9b353.tar.bz2 manaplus-c3afff20d4989ab2835545715bbe67e5b5d9b353.tar.xz manaplus-c3afff20d4989ab2835545715bbe67e5b5d9b353.zip |
Fix code style.
Diffstat (limited to 'src')
-rw-r--r-- | src/animatedsprite.cpp | 5 | ||||
-rw-r--r-- | src/resources/image.cpp | 6 | ||||
-rw-r--r-- | src/test/testlauncher.cpp | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 1014fbe46..1dc5b16c8 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -143,8 +143,11 @@ bool AnimatedSprite::update(int time) bool AnimatedSprite::updateCurrentAnimation(unsigned int time) { // move code from Animation::isTerminator(*mFrame) - if (!mFrame || !mAnimation || (!mFrame->image && mFrame->type == Frame::ANIMATION)) + if (!mFrame || !mAnimation || (!mFrame->image + && mFrame->type == Frame::ANIMATION)) + { return false; + } mFrameTime += time; diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 0c4735043..4e7a9ceef 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -168,7 +168,8 @@ Resource *Image::load(SDL_RWops *rw, Dye const &dye) if (pal) { - for (Uint32 *p_end = pixels + surf->w * surf->h; pixels != p_end; ++pixels) + for (Uint32 *p_end = pixels + surf->w * surf->h; + pixels != p_end; ++pixels) { Uint8 *p = (Uint8 *)pixels; const int alpha = *p & 255; @@ -179,7 +180,8 @@ Resource *Image::load(SDL_RWops *rw, Dye const &dye) } else { - for (Uint32 *p_end = pixels + surf->w * surf->h; pixels != p_end; ++pixels) + for (Uint32 *p_end = pixels + surf->w * surf->h; + pixels != p_end; ++pixels) { const Uint32 p = *pixels; const int alpha = p & 255; diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 59b98d754..e988bd011 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -128,7 +128,8 @@ int TestLauncher::testFps() Image *img[5]; img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); - img[1] = Theme::getImageFromTheme("graphics/gui/target-cursor-normal-l.png"); + img[1] = Theme::getImageFromTheme( + "graphics/gui/target-cursor-normal-l.png"); img[2] = Theme::getImageFromTheme("themes/wood/window.png"); img[3] = Theme::getImageFromTheme("themes/pink/window.png"); img[4] = Theme::getImageFromTheme("graphics/images/login_wallpaper.png"); |