Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed a bug found during test related to min / map particle logic

This commit is contained in:
Mark Vejvoda 2011-07-02 02:52:30 +00:00
parent 50347b0a66
commit 8b23634332
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/glest_game/type_instances/unit.cpp
View File

@ -2216,13 +2216,15 @@ void Unit::stopDamageParticles(bool force) {
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
UnitParticleSystem *ps = damageParticleSystems[i];
UnitParticleSystemType *pst = NULL;
int foundParticleIndexType = -1;
int foundParticleIndexType = -2;
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
if(iterMap->second == ps) {
foundParticleIndexType = iterMap->first;
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
if(foundParticleIndexType >= 0) {
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
}
}
}
if(force == true || pst == NULL ||
@ -2242,13 +2244,15 @@ void Unit::checkCustomizedParticleTriggers(bool force) {
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) {
UnitParticleSystem *ps = damageParticleSystems[i];
UnitParticleSystemType *pst = NULL;
int foundParticleIndexType = -1;
int foundParticleIndexType = -2;
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
if(iterMap->second == ps) {
foundParticleIndexType = iterMap->first;
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
if(foundParticleIndexType >= 0) {
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
}
}
}