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

dying units did not clear their fields the way it was meant :)

This commit is contained in:
Titus Tscharntke 2012-09-14 23:46:01 +00:00
parent 3e0e9620ae
commit 4f19451a6a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1564,7 +1564,10 @@ void Unit::kill() {
} }
//do the cleaning //do the cleaning
map->clearUnitCells(this, pos); //clear commands ( and their blocking fields )
clearCommands();
map->clearUnitCells(this, pos, true);
if(isBeingBuilt() == false) { if(isBeingBuilt() == false) {
faction->removeStore(type); faction->removeStore(type);
} }
@ -1572,8 +1575,6 @@ void Unit::kill() {
notifyObservers(UnitObserver::eKill); notifyObservers(UnitObserver::eKill);
//clear commands
clearCommands();
UnitUpdater *unitUpdater = game->getWorld()->getUnitUpdater(); UnitUpdater *unitUpdater = game->getWorld()->getUnitUpdater();
//unitUpdater->clearUnitPrecache(this); //unitUpdater->clearUnitPrecache(this);
@ -2951,12 +2952,11 @@ CommandResult Unit::undoCommand(Command *command){
throw megaglest_runtime_error(szBuf); throw megaglest_runtime_error(szBuf);
} }
if(this->currSkill->getClass() == scMorph){ if(getCurrCommand() == command && this->currSkill->getClass() == scMorph ){
// clear cells of morphed unit and set those of current unit! // clear cells of morphed unit and set those of current unit!
map->clearUnitCells(this, this->getPos()); map->clearUnitCells(this, this->getPos());
map->putUnitCells(this, this->getPos(),true); map->putUnitCells(this, this->getPos(),true);
} }
//return cost //return cost
const ProducibleType *produced= command->getCommandType()->getProduced(); const ProducibleType *produced= command->getCommandType()->getProduced();
if(produced!=NULL){ if(produced!=NULL){