summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-30 13:59:45 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-20 21:58:39 +0300
commitbc3a7cf853510ffe1e42dc683f854d360f6528c7 (patch)
tree9898f13eafc3e1a20388d8d592bfcc05c8f50ba7 /src/particle
parenta058af57bddd4a4394401cc75d33461e17aab8c1 (diff)
downloadmanaverse-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.gz
manaverse-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.bz2
manaverse-bc3a7cf853510ffe1e42dc683f854d360f6528c7.tar.xz
manaverse-bc3a7cf853510ffe1e42dc683f854d360f6528c7.zip
Add pugixml backend incomplete.
Add some defines for xml nodes manipulation. With pugixml backend no xml writing.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/particle.cpp14
-rw-r--r--src/particle/particleemitter.cpp5
2 files changed, 6 insertions, 13 deletions
diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp
index 2555cfb23..f22f11252 100644
--- a/src/particle/particle.cpp
+++ b/src/particle/particle.cpp
@@ -338,11 +338,8 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
else if ((node = XML::findFirstChildByName(effectChildNode, "image")))
{
std::string imageSrc;
- if (node && node->xmlChildrenNode)
- {
- imageSrc = reinterpret_cast<const char*>(
- node->xmlChildrenNode->content);
- }
+ if (node && XmlHaveChildContent(node))
+ imageSrc = XmlChildContent(node);
if (!imageSrc.empty() && !dyePalettes.empty())
Dye::instantiate(imageSrc, dyePalettes);
Image *const img = resourceManager->getImage(imageSrc);
@@ -393,11 +390,8 @@ Particle *Particle::addEffect(const std::string &restrict particleEffectFile,
else if (xmlNameEqual(emitterNode, "deatheffect"))
{
std::string deathEffect;
- if (node && node->xmlChildrenNode)
- {
- deathEffect = reinterpret_cast<const char*>(
- emitterNode->xmlChildrenNode->content);
- }
+ if (node && XmlHaveChildContent(node))
+ deathEffect = XmlChildContent(emitterNode);
char deathEffectConditions = 0x00;
if (XML::getBoolProperty(emitterNode, "on-floor", true))
diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp
index 7ee3a4252..a512cff94 100644
--- a/src/particle/particleemitter.cpp
+++ b/src/particle/particleemitter.cpp
@@ -317,10 +317,9 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode,
}
else if (xmlNameEqual(propertyNode, "deatheffect"))
{
- if (!propertyNode->xmlChildrenNode)
+ if (!XmlHaveChildContent(propertyNode))
continue;
- mDeathEffect = reinterpret_cast<const char*>(
- propertyNode->xmlChildrenNode->content);
+ mDeathEffect = XmlChildContent(propertyNode);
mDeathEffectConditions = 0x00;
if (XML::getBoolProperty(propertyNode, "on-floor", true))
{