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

- found a rare case where cancelling an upgrade with multiple upgrades happening and a unit dies causes a crash

This commit is contained in:
Mark Vejvoda 2011-04-18 05:34:31 +00:00
parent 762a612e33
commit 0a0ee9113c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/glest_game/type_instances/upgrade.cpp
View File

@ -84,8 +84,24 @@ void UpgradeManager::startUpgrade(const UpgradeType *upgradeType, int factionInd
void UpgradeManager::cancelUpgrade(const UpgradeType *upgradeType) {
map<const UpgradeType *,int>::iterator iterFind = upgradesLookup.find(upgradeType);
if(iterFind != upgradesLookup.end()) {
upgrades.erase(upgrades.begin() + iterFind->second);
if(iterFind->second >= upgrades.size()) {
char szBuf[1024]="";
sprintf(szBuf,"Error canceling upgrade, iterFind->second >= upgrades.size() - [%d] : [%d]",iterFind->second,(int)upgrades.size());
throw runtime_error("Error canceling upgrade, upgrade not found in upgrade manager");
}
int eraseIndex = iterFind->second;
upgrades.erase(upgrades.begin() + eraseIndex);
upgradesLookup.erase(upgradeType);
for(map<const UpgradeType *,int>::iterator iterMap = upgradesLookup.begin();
iterMap != upgradesLookup.end(); iterMap++) {
if(iterMap->second >= upgrades.size()) {
iterMap->second--;
}
if(iterMap->second < 0) {
upgradesLookup.erase(iterMap->first);
}
}
}
else {
throw runtime_error("Error canceling upgrade, upgrade not found in upgrade manager");