summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 19:32:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 19:32:59 +0300
commit1b1a7cea1c6b81438bacc86b93cb80a78430790f (patch)
treed23f4e0beea6b4e5c570afafd9ad9de6b68ba812 /src/particle
parentbb8be1acea37f09c134d7d4042869a679cf8a12b (diff)
downloadManaVerse-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.gz
ManaVerse-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.bz2
ManaVerse-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.xz
ManaVerse-1b1a7cea1c6b81438bacc86b93cb80a78430790f.zip
Change namespace in resources loaders from other to Loader.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp2
-rw-r--r--src/particle/particleemitter.cpp6
-rw-r--r--src/particle/particleengine.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 3c3a0b836..f7ecccd93 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -440,7 +440,7 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
imageSrc = XmlChildContent(node);
if (!imageSrc.empty() && !dyePalettes.empty())
Dye::instantiate(imageSrc, dyePalettes);
- Image *const img = ImageLoader::getImage(imageSrc);
+ Image *const img = Loader::getImage(imageSrc);
newParticle = new ImageParticle(img);
newParticle->setMap(mMap);
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index eaebc16fd..1cfe93f6e 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -122,7 +122,7 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode,
{
if (!dyePalettes.empty())
Dye::instantiate(image, dyePalettes);
- mParticleImage = ImageLoader::getImage(image);
+ mParticleImage = Loader::getImage(image);
}
}
else if (name == "subimage")
@@ -134,7 +134,7 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode,
{
if (!dyePalettes.empty())
Dye::instantiate(image, dyePalettes);
- Image *img = ImageLoader::getImage(image);
+ Image *img = Loader::getImage(image);
if (img)
{
mParticleImage = Loader::getSubImage(img,
@@ -373,7 +373,7 @@ ImageSet *ParticleEmitter::getImageSet(XmlNodePtrConst node)
const int subX = XML::getProperty(node, "subX", -1);
if (subX != -1)
{
- Image *const img = ImageLoader::getImage(XML::getProperty(
+ Image *const img = Loader::getImage(XML::getProperty(
node, "imageset", ""));
if (!img)
return nullptr;
diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp
index bd05e967b..6fd9a79f9 100644
--- a/src/particle/particleengine.cpp
+++ b/src/particle/particleengine.cpp
@@ -176,7 +176,7 @@ Particle *ParticleEngine::addEffect(const std::string &restrict
imageSrc = XmlChildContent(node);
if (!imageSrc.empty() && !dyePalettes.empty())
Dye::instantiate(imageSrc, dyePalettes);
- Image *const img = ImageLoader::getImage(imageSrc);
+ Image *const img = Loader::getImage(imageSrc);
newParticle = new ImageParticle(img);
newParticle->setMap(mMap);