diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/localplayer.cpp | 6 | ||||
| -rw-r--r-- | src/resources/animation.cpp | 4 | ||||
| -rw-r--r-- | src/resources/image.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index a4289b22b..c7ad181df 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2577,9 +2577,9 @@ bool LocalPlayer::isReachable(Being *being, int maxCost) return true; } else if (being->getTileX() - 1 <= getTileX() - && being->getTileX() + 1 >= getTileX() - && being->getTileY() - 1 <= getTileY() - && being->getTileY() + 1 >= getTileY()) + && being->getTileX() + 1 >= getTileX() + && being->getTileY() - 1 <= getTileY() + && being->getTileY() + 1 >= getTileY()) { being->setDistance(1); being->setIsReachable(Being::REACH_YES); diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 49751d2fa..10b017cd1 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -32,8 +32,8 @@ Animation::Animation(): void Animation::addFrame(Image *image, int delay, int offsetX, int offsetY, int rand) { - Frame frame = { image, delay, offsetX, offsetY, - rand, Frame::ANIMATION, "" }; + Frame frame + = { image, delay, offsetX, offsetY, rand, Frame::ANIMATION, "" }; mFrames.push_back(frame); mDuration += delay; } diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 4b07556cf..d5db3b211 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -555,7 +555,7 @@ Image *Image::_SDLload(SDL_Surface *tmpImage) for (int i = 0; i < tmpImage->w * tmpImage->h; ++ i) { Uint8 a; - if(fmt->Amask) + if (fmt->Amask) { unsigned v = ((static_cast<Uint32*>(tmpImage->pixels))[i] & fmt->Amask) >> fmt->Ashift; |