- fixed a bug found during test related to min / map particle logic
This commit is contained in:
parent
50347b0a66
commit
8b23634332
|
@ -2216,13 +2216,15 @@ void Unit::stopDamageParticles(bool force) {
|
||||||
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
|
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
|
||||||
UnitParticleSystem *ps = damageParticleSystems[i];
|
UnitParticleSystem *ps = damageParticleSystems[i];
|
||||||
UnitParticleSystemType *pst = NULL;
|
UnitParticleSystemType *pst = NULL;
|
||||||
int foundParticleIndexType = -1;
|
int foundParticleIndexType = -2;
|
||||||
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
|
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
|
||||||
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
|
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
|
||||||
if(iterMap->second == ps) {
|
if(iterMap->second == ps) {
|
||||||
foundParticleIndexType = iterMap->first;
|
foundParticleIndexType = iterMap->first;
|
||||||
pst = type->damageParticleSystemTypes[foundParticleIndexType];
|
if(foundParticleIndexType >= 0) {
|
||||||
break;
|
pst = type->damageParticleSystemTypes[foundParticleIndexType];
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(force == true || pst == NULL ||
|
if(force == true || pst == NULL ||
|
||||||
|
@ -2242,13 +2244,15 @@ void Unit::checkCustomizedParticleTriggers(bool force) {
|
||||||
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
|
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
|
||||||
UnitParticleSystem *ps = damageParticleSystems[i];
|
UnitParticleSystem *ps = damageParticleSystems[i];
|
||||||
UnitParticleSystemType *pst = NULL;
|
UnitParticleSystemType *pst = NULL;
|
||||||
int foundParticleIndexType = -1;
|
int foundParticleIndexType = -2;
|
||||||
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
|
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
|
||||||
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
|
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
|
||||||
if(iterMap->second == ps) {
|
if(iterMap->second == ps) {
|
||||||
foundParticleIndexType = iterMap->first;
|
foundParticleIndexType = iterMap->first;
|
||||||
pst = type->damageParticleSystemTypes[foundParticleIndexType];
|
if(foundParticleIndexType >= 0) {
|
||||||
break;
|
pst = type->damageParticleSystemTypes[foundParticleIndexType];
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue