mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 02:24:00 +00:00
Code Issues Releases Wiki Activity

Fix bone particles broken in 8472718fb7

Browse source
This commit is contained in:
fgenesis 2016-08-02 02:44:50 +02:00
parent 2d47b4a7b3
commit 00900a9dfb
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BBGE/SkeletalSprite.cpp
View file

@ -1316,19 +1316,21 @@ void SkeletalSprite::loadSkeletal(const std::string &fn)
std::string pfile; std::string pfile;
while (is >> slot) while (is >> slot)
{ {
if(slot > 0) if(slot < 0)
{ {
errorLog("particle slot < 0");
break;
}
is >> pfile; is >> pfile;
// add particle system + load // add particle system + load
ParticleEffect *e = new ParticleEffect; ParticleEffect *e = new ParticleEffect;
if(newb->emitters.size() < (size_t)slot) if(newb->emitters.size() <= (size_t)slot)
newb->emitters.resize(slot+4); newb->emitters.resize(slot+4, NULL);
newb->emitters[slot] = e; newb->emitters[slot] = e;
newb->addChild(e, PM_POINTER); newb->addChild(e, PM_POINTER);
e->load(pfile); e->load(pfile);
} }
} }
}
XMLElement *fr=0; XMLElement *fr=0;
fr = bone->FirstChildElement("Frame"); fr = bone->FirstChildElement("Frame");
int frc=0; int frc=0;