diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-08 20:30:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-08 20:30:40 +0300 |
| commit | fd3223578c0a0789627a92cc63235c24e75f87c3 (patch) | |
| tree | 48b90671150a8ea4a7d3b9306d3eabca349d556a /src/resources/sprite | |
| parent | 27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (diff) | |
| download | manaverse-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.gz manaverse-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.bz2 manaverse-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.xz manaverse-fd3223578c0a0789627a92cc63235c24e75f87c3.zip | |
Remove most setters and getters from Resource class.
Diffstat (limited to 'src/resources/sprite')
| -rw-r--r-- | src/resources/sprite/animatedsprite.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sprite/spritedef.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 3e9250e13..7b6900510 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -405,7 +405,7 @@ std::string AnimatedSprite::getIdPath() const restrict2 { if (!mSprite) return ""; - return mSprite->getIdPath(); + return mSprite->mIdPath; } const Image* AnimatedSprite::getImage() const restrict2 noexcept2 diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 2b79c3806..263caebe2 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -125,7 +125,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, if (prot) { def->incRef(); - def->setProtected(true); + def->mProtected = true; } doc->decRef(); BLOCK_END("SpriteDef::load") @@ -269,7 +269,7 @@ const ImageSet *SpriteDef::getImageSet(const std::string &imageSetName) const reportAlways("%s: Imageset \"%s\" not defined in %s", mSource.c_str(), imageSetName.c_str(), - getIdPath().c_str()); + mIdPath.c_str()); return nullptr; } return si->second; @@ -291,7 +291,7 @@ void SpriteDef::loadAction(XmlNodeConstPtr node, reportAlways("%s: Unknown action \"%s\" defined in %s", mSource.c_str(), actionName.c_str(), - getIdPath().c_str()); + mIdPath.c_str()); return; } Action *const action = new Action(actionName); @@ -333,7 +333,7 @@ void SpriteDef::loadAnimation(XmlNodeConstPtr animationNode, reportAlways("%s: Unknown direction \"%s\" used in %s", mSource.c_str(), directionName.c_str(), - getIdPath().c_str()); + mIdPath.c_str()); return; } |