From 331468dbfb8de05723c62149036cb8a51e769baf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 1 Jan 2016 16:49:00 +0300 Subject: Fix code style. --- src/resources/map/map.h | 6 ++++-- src/resources/sprite/animatedsprite.cpp | 3 ++- src/resources/sprite/animatedsprite.h | 12 ++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/resources') diff --git a/src/resources/map/map.h b/src/resources/map/map.h index b4495d11d..4a3d2ed9c 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -299,8 +299,10 @@ class Map final : public Properties, public ConfigListener const ObjectsLayer* getObjectsLayer() const restrict2 A_WARN_UNUSED { return mObjects; } - std::string getObjectData(const unsigned x, const unsigned y, - const int type) const restrict2 A_WARN_UNUSED; + std::string getObjectData(const unsigned x, + const unsigned y, + const int type) const + restrict2 A_WARN_UNUSED; void indexTilesets() restrict2; diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 43c11497a..242559e6d 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -244,7 +244,8 @@ bool AnimatedSprite::updateCurrentAnimation(const unsigned int time) restrict2 { for (size_t i = 0; i < mAnimation->getLength(); i ++) { - const Frame *restrict const frame = &mAnimation->mFrames[i]; + const Frame *restrict const frame = + &mAnimation->mFrames[i]; if (frame->type == Frame::LABEL && mFrame->nextAction == frame->nextAction) { diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h index 752e66eee..722c5b715 100644 --- a/src/resources/sprite/animatedsprite.h +++ b/src/resources/sprite/animatedsprite.h @@ -155,10 +155,14 @@ class AnimatedSprite final : public Sprite unsigned int mFrameIndex; /**< The index of the current frame. */ unsigned int mFrameTime; /**< The time since start of frame. */ - SpriteDef *restrict mSprite; /**< The sprite definition. */ - const Action *restrict mAction; /**< The currently active action. */ - const Animation *restrict mAnimation; /**< The currently active animation. */ - const Frame *restrict mFrame; /**< The currently active frame. */ + /**< The sprite definition. */ + SpriteDef *restrict mSprite; + /**< The currently active action. */ + const Action *restrict mAction; + /**< The currently active animation. */ + const Animation *restrict mAnimation; + /**< The currently active frame. */ + const Frame *restrict mFrame; unsigned mNumber; unsigned mNumber1; AnimationDelayLoad *mDelayLoad; -- cgit v1.2.3-60-g2f50