From 554a03279ef2116f500c99b407e78251d3213059 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 23 Dec 2010 20:22:40 +0000 Subject: [PATCH] - commented out assert is it should be handled by the map logic --- source/glest_game/world/world.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index df3a5265..76a66e11 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -332,7 +332,7 @@ void World::update(){ //water effects waterEffects.update(1.0f); - // attack effects + // attack effects attackEffects.update(0.25f); //bool needToUpdateUnits = true; @@ -554,7 +554,7 @@ void World::moveUnitCells(Unit *unit) { Vec2i newPos= unit->getTargetPos(); //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 // from the old one