From fd3223578c0a0789627a92cc63235c24e75f87c3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Apr 2017 20:30:40 +0300 Subject: Remove most setters and getters from Resource class. --- src/resources/sprite/animatedsprite.cpp | 2 +- src/resources/sprite/spritedef.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/resources/sprite') 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; } -- cgit v1.2.3-70-g09d2