summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-07 20:38:10 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-24 00:08:35 +0300
commitd1590377de1141144d59ca1160de2822177f6f2a (patch)
treea368b251dedc7164cadbfe459de4cf5c983acf98 /src/particle
parent65422e722cfe0616c65498c71aa0651857dcc49a (diff)
downloadmanaverse-d1590377de1141144d59ca1160de2822177f6f2a.tar.gz
manaverse-d1590377de1141144d59ca1160de2822177f6f2a.tar.bz2
manaverse-d1590377de1141144d59ca1160de2822177f6f2a.tar.xz
manaverse-d1590377de1141144d59ca1160de2822177f6f2a.zip
Add support for tinyxml2 for reading / writing xml files.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp2
-rw-r--r--src/particle/particleemitter.cpp2
-rw-r--r--src/particle/particleemitter.h2
-rw-r--r--src/particle/particleengine.cpp2
-rw-r--r--src/particle/rotationalparticle.cpp2
-rw-r--r--src/particle/rotationalparticle.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 9f5708b26..d518a15a3 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -417,7 +417,7 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
SkipError_false);
if (!doc)
return nullptr;
- const XmlNodePtrConst rootNode = doc->rootNode();
+ XmlNodeConstPtrConst rootNode = doc->rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "effect"))
{
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 9492a01b1..09008b363 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -48,7 +48,7 @@ static const float DEG_RAD_FACTOR = 0.017453293F;
typedef std::vector<ImageSet*>::const_iterator ImageSetVectorCIter;
typedef std::list<ParticleEmitter>::const_iterator ParticleEmitterListCIter;
-ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode,
+ParticleEmitter::ParticleEmitter(XmlNodeConstPtrConst emitterNode,
Particle *const target,
Map *const map, const int rotation,
const std::string& dyePalettes) :
diff --git a/src/particle/particleemitter.h b/src/particle/particleemitter.h
index 0d5110e77..7164d3e1d 100644
--- a/src/particle/particleemitter.h
+++ b/src/particle/particleemitter.h
@@ -43,7 +43,7 @@ class Particle;
class ParticleEmitter final
{
public:
- ParticleEmitter(const XmlNodePtrConst emitterNode,
+ ParticleEmitter(XmlNodeConstPtrConst emitterNode,
Particle *const target,
Map *const map,
const int rotation = 0,
diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp
index b63d1c53c..2ac1d7166 100644
--- a/src/particle/particleengine.cpp
+++ b/src/particle/particleengine.cpp
@@ -142,7 +142,7 @@ Particle *ParticleEngine::addEffect(const std::string &restrict
if (!doc)
return nullptr;
- const XmlNodePtrConst rootNode = doc->rootNode();
+ XmlNodeConstPtrConst rootNode = doc->rootNode();
if (!rootNode || !xmlNameEqual(rootNode, "effect"))
{
diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp
index c471bd01a..0693530d6 100644
--- a/src/particle/rotationalparticle.cpp
+++ b/src/particle/rotationalparticle.cpp
@@ -33,7 +33,7 @@ RotationalParticle::RotationalParticle(Animation *restrict const animation) :
mAnimation = new SimpleAnimation(animation);
}
-RotationalParticle::RotationalParticle(const XmlNodePtr animationNode,
+RotationalParticle::RotationalParticle(XmlNodeConstPtr animationNode,
const std::string &restrict
dyePalettes) :
ImageParticle(nullptr)
diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h
index a51035c50..60c8461b1 100644
--- a/src/particle/rotationalparticle.h
+++ b/src/particle/rotationalparticle.h
@@ -34,7 +34,7 @@ class RotationalParticle final : public ImageParticle
public:
explicit RotationalParticle(Animation *restrict const animation);
- explicit RotationalParticle(const XmlNodePtr animationNode,
+ explicit RotationalParticle(XmlNodeConstPtr animationNode,
const std::string &restrict dyePalettes
= std::string());