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

- bugfix for stopping damage particles properly

This commit is contained in:
Mark Vejvoda 2011-07-02 03:59:46 +00:00
parent 8b23634332
commit f9ad27f655
1 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2202,6 +2202,8 @@ CommandResult Unit::undoCommand(Command *command){
void Unit::stopDamageParticles(bool force) { void Unit::stopDamageParticles(bool force) {
if(force == true || (hp > type->getTotalMaxHp(&totalUpgrade) / 2) ) { if(force == true || (hp > type->getTotalMaxHp(&totalUpgrade) / 2) ) {
//printf("Checking to stop damageparticles for unit [%s - %d] hp = %d\n",this->getType()->getName().c_str(),this->getId(),hp);
if(Renderer::getInstance().validateParticleSystemStillExists(fire,rsGame) == false) { if(Renderer::getInstance().validateParticleSystemStillExists(fire,rsGame) == false) {
fire = NULL; fire = NULL;
} }
@ -2213,7 +2215,37 @@ void Unit::stopDamageParticles(bool force) {
} }
// stop additional particles // stop additional particles
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) { if(damageParticleSystems.size() > 0) {
for(int i = damageParticleSystems.size()-1; i >= 0; --i) {
UnitParticleSystem *ps = damageParticleSystems[i];
UnitParticleSystemType *pst = NULL;
int foundParticleIndexType = -2;
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin();
iterMap != damageParticleSystemsInUse.end(); ++iterMap) {
if(iterMap->second == ps) {
foundParticleIndexType = iterMap->first;
if(foundParticleIndexType >= 0) {
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
}
}
}
if(force == true || pst->getMinmaxEnabled() == false) {
damageParticleSystemsInUse.erase(foundParticleIndexType);
ps->fade();
damageParticleSystems.pop_back();
}
}
}
}
checkCustomizedParticleTriggers(force);
}
void Unit::checkCustomizedParticleTriggers(bool force) {
// Now check if we have special hp triggered particles
if(damageParticleSystems.size() > 0) {
for(int i = damageParticleSystems.size()-1; i >= 0; --i) {
UnitParticleSystem *ps = damageParticleSystems[i]; UnitParticleSystem *ps = damageParticleSystems[i];
UnitParticleSystemType *pst = NULL; UnitParticleSystemType *pst = NULL;
int foundParticleIndexType = -2; int foundParticleIndexType = -2;
@ -2227,66 +2259,40 @@ void Unit::stopDamageParticles(bool force) {
} }
} }
} }
if(force == true || pst == NULL ||
pst->getMinmaxEnabled() == false) {
damageParticleSystemsInUse.erase(foundParticleIndexType);
ps->fade();
damageParticleSystems.pop_back();
}
}
}
checkCustomizedParticleTriggers(force); if(force == true || (pst != NULL && pst->getMinmaxEnabled() == true)) {
} bool stopParticle = force;
if(force == false) {
void Unit::checkCustomizedParticleTriggers(bool force) { if(pst->getMinmaxIsPercent() == false) {
// Now check if we have special hp triggered particles if(hp < pst->getMinHp() || hp > pst->getMaxHp()) {
for(unsigned int i = damageParticleSystems.size()-1; i <= 0; --i) { stopParticle = true;
UnitParticleSystem *ps = damageParticleSystems[i]; }
UnitParticleSystemType *pst = NULL; }
int foundParticleIndexType = -2; else {
for(std::map<int, UnitParticleSystem *>::iterator iterMap = damageParticleSystemsInUse.begin(); int hpPercent = (hp / type->getTotalMaxHp(&totalUpgrade) * 100);
iterMap != damageParticleSystemsInUse.end(); ++iterMap) { if(hpPercent < pst->getMinHp() || hpPercent > pst->getMaxHp()) {
if(iterMap->second == ps) { stopParticle = true;
foundParticleIndexType = iterMap->first; }
if(foundParticleIndexType >= 0) {
pst = type->damageParticleSystemTypes[foundParticleIndexType];
break;
}
}
}
if(force == true || (pst != NULL && pst->getMinmaxEnabled() == true)) {
bool stopParticle = force;
if(force == false) {
if(pst->getMinmaxIsPercent() == false) {
if(hp < pst->getMinHp() || hp > pst->getMaxHp()) {
stopParticle = true;
} }
} }
else {
int hpPercent = (hp / type->getTotalMaxHp(&totalUpgrade) * 100); //printf("CHECKING to STOP customized particle trigger by HP [%d to %d percentbased = %d] current hp = %d stopParticle = %d\n",pst->getMinHp(),pst->getMaxHp(),pst->getMinmaxIsPercent(),hp,stopParticle);
if(hpPercent < pst->getMinHp() || hpPercent > pst->getMaxHp()) {
stopParticle = true; if(stopParticle == true) {
} //printf("STOPPING customized particle trigger by HP [%d to %d] current hp = %d\n",pst->getMinHp(),pst->getMaxHp(),hp);
damageParticleSystemsInUse.erase(foundParticleIndexType);
ps->fade();
damageParticleSystems.pop_back();
} }
} }
//printf("CHECKING to STOP customized particle trigger by HP [%d to %d percentbased = %d] current hp = %d stopParticle = %d\n",pst->getMinHp(),pst->getMaxHp(),pst->getMinmaxIsPercent(),hp,stopParticle);
if(stopParticle == true) {
//printf("STOPPING customized particle trigger by HP [%d to %d] current hp = %d\n",pst->getMinHp(),pst->getMaxHp(),hp);
damageParticleSystemsInUse.erase(foundParticleIndexType);
ps->fade();
damageParticleSystems.pop_back();
}
} }
} }
// Now check if we have special hp triggered particles // Now check if we have special hp triggered particles
//start additional particles //start additional particles
if( showUnitParticles && (type->damageParticleSystemTypes.empty() == false) ) { if(showUnitParticles && (type->damageParticleSystemTypes.empty() == false) &&
force == false && alive == true) {
for(unsigned int i = 0; i < type->damageParticleSystemTypes.size(); ++i) { for(unsigned int i = 0; i < type->damageParticleSystemTypes.size(); ++i) {
UnitParticleSystemType *pst = type->damageParticleSystemTypes[i]; UnitParticleSystemType *pst = type->damageParticleSystemTypes[i];
@ -2323,7 +2329,7 @@ void Unit::checkCustomizedParticleTriggers(bool force) {
} }
void Unit::startDamageParticles() { void Unit::startDamageParticles() {
if(hp < type->getMaxHp() / 2 && hp > 0) { if(hp < type->getMaxHp() / 2 && hp > 0 && alive == true) {
//start additional particles //start additional particles
if( showUnitParticles && (!type->damageParticleSystemTypes.empty()) ) { if( showUnitParticles && (!type->damageParticleSystemTypes.empty()) ) {
for(unsigned int i = 0; i < type->damageParticleSystemTypes.size(); ++i) { for(unsigned int i = 0; i < type->damageParticleSystemTypes.size(); ++i) {