summaryrefslogtreecommitdiff
path: root/src/resources/atlas
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-08 20:30:40 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-08 20:30:40 +0300
commitfd3223578c0a0789627a92cc63235c24e75f87c3 (patch)
tree48b90671150a8ea4a7d3b9306d3eabca349d556a /src/resources/atlas
parent27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (diff)
downloadmanaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.gz
manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.bz2
manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.xz
manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.zip
Remove most setters and getters from Resource class.
Diffstat (limited to 'src/resources/atlas')
-rw-r--r--src/resources/atlas/atlasmanager.cpp6
-rw-r--r--src/resources/atlas/atlasresource.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 91749e597..4f38439ad 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -216,7 +216,7 @@ void AtlasManager::simpleSort(const std::string &restrict name,
if (img)
{
atlas->name = std::string("atlas_").append(name).append(
- "_").append(img->getIdPath());
+ "_").append(img->mIdPath);
break;
}
}
@@ -227,7 +227,7 @@ void AtlasManager::simpleSort(const std::string &restrict name,
if (img)
{
AtlasItem *const item = new AtlasItem(img);
- item->name = img->getIdPath();
+ item->name = img->mIdPath;
// start next line
if (x + img->mBounds.w > size)
{
@@ -244,7 +244,7 @@ void AtlasManager::simpleSort(const std::string &restrict name,
atlases.push_back(atlas);
atlas = new TextureAtlas;
atlas->name = std::string("atlas_").append(name).append(
- "_").append(img->getIdPath());
+ "_").append(img->mIdPath);
}
if (img->mBounds.h > tempHeight)
diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp
index 06ae62542..eab7c660e 100644
--- a/src/resources/atlas/atlasresource.cpp
+++ b/src/resources/atlas/atlasresource.cpp
@@ -58,7 +58,7 @@ AtlasResource::~AtlasResource()
void AtlasResource::incRef()
{
- if (!getRefCount())
+ if (!mRefCount)
AtlasManager::injectToResources(this);
Resource::incRef();
}
@@ -66,7 +66,7 @@ void AtlasResource::incRef()
void AtlasResource::decRef()
{
Resource::decRef();
- if (!getRefCount())
+ if (!mRefCount)
AtlasManager::moveToDeleted(this);
}