summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-01 16:49:00 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-01 16:49:00 +0300
commit331468dbfb8de05723c62149036cb8a51e769baf (patch)
treeac481eb2ef64dc718d134e2c8134919e49017943 /src/resources
parent69ed7e5ae640b0a2cd95d66b42b4c369fe522433 (diff)
downloadplus-331468dbfb8de05723c62149036cb8a51e769baf.tar.gz
plus-331468dbfb8de05723c62149036cb8a51e769baf.tar.bz2
plus-331468dbfb8de05723c62149036cb8a51e769baf.tar.xz
plus-331468dbfb8de05723c62149036cb8a51e769baf.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.h6
-rw-r--r--src/resources/sprite/animatedsprite.cpp3
-rw-r--r--src/resources/sprite/animatedsprite.h12
3 files changed, 14 insertions, 7 deletions
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;