From ee249b8878616f35d701a2113bad03dd6c885920 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 27 Nov 2010 08:23:45 +0000 Subject: [PATCH] - commented out another possibly bad assert /exception --- source/glest_game/world/map.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/glest_game/world/map.cpp b/source/glest_game/world/map.cpp index 9aee461a9..a252fe1ed 100644 --- a/source/glest_game/world/map.cpp +++ b/source/glest_game/world/map.cpp @@ -820,10 +820,12 @@ void Map::putUnitCells(Unit *unit, const Vec2i &pos) { } if( ut->hasCellMap() == false || ut->getCellMapCell(i, j, unit->getModelFacing())) { - assert(getCell(currPos)->getUnit(unit->getCurrField()) == NULL); - if(getCell(currPos)->getUnit(unit->getCurrField()) != NULL) { - throw runtime_error("getCell(currPos)->getUnit(unit->getCurrField()) != NULL"); - } + // NOT SURE UNDER WHAT CONDITIONS THIS COULD HAPPEN? + + //assert(getCell(currPos)->getUnit(unit->getCurrField()) == NULL); + //if(getCell(currPos)->getUnit(unit->getCurrField()) != NULL) { + // throw runtime_error("getCell(currPos)->getUnit(unit->getCurrField()) != NULL"); + //} getCell(currPos)->setUnit(unit->getCurrField(), unit);