- commented out assert is it should be handled by the map logic
This commit is contained in:
parent
809d56e86c
commit
554a03279e
|
@ -332,7 +332,7 @@ void World::update(){
|
||||||
|
|
||||||
//water effects
|
//water effects
|
||||||
waterEffects.update(1.0f);
|
waterEffects.update(1.0f);
|
||||||
// attack effects
|
// attack effects
|
||||||
attackEffects.update(0.25f);
|
attackEffects.update(0.25f);
|
||||||
|
|
||||||
//bool needToUpdateUnits = true;
|
//bool needToUpdateUnits = true;
|
||||||
|
@ -554,7 +554,7 @@ void World::moveUnitCells(Unit *unit) {
|
||||||
Vec2i newPos= unit->getTargetPos();
|
Vec2i newPos= unit->getTargetPos();
|
||||||
|
|
||||||
//newPos must be free or the same pos as current
|
//newPos must be free or the same pos as current
|
||||||
assert(map.getCell(unit->getPos())->getUnit(unit->getCurrField())==unit || map.isFreeCell(newPos, unit->getCurrField()));
|
//assert(map.getCell(unit->getPos())->getUnit(unit->getCurrField())==unit || map.isFreeCell(newPos, unit->getCurrField()));
|
||||||
|
|
||||||
// Only change cell placement in map if the new position is different
|
// Only change cell placement in map if the new position is different
|
||||||
// from the old one
|
// from the old one
|
||||||
|
|
Loading…
Reference in New Issue