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

- attempt to see if this change corrects out of synch

This commit is contained in:
Mark Vejvoda 2011-02-19 22:36:59 +00:00
parent 755bed6553
commit 92ca6ba75d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/glest_game/world/map.cpp
View File

@ -453,20 +453,8 @@ bool Map::isFreeCellsOrHasUnit(const Vec2i &pos, int size, Field field,
}
for (int i = 1; i <= munit->getSize(); ++i) {
for (int j = 1; j <= munit->getSize(); ++j) {
if (munit->hasCellMap() == true) {
// special calculation for units using cellmaps
if (munit->getCellMapCell(i - 1, j - 1, unit->getModelFacing()) == true) {
if (isFreeCellOrHasUnit(
Vec2i(pos.x + i - 1, pos.y + j - 1), field, unit) == false) {
return false;
}
}
}
else {
if (isFreeCellOrHasUnit(Vec2i(pos.x + i - 1, pos.y + j - 1),
field, unit) == false) {
return false;
}
if(isFreeCellOrHasUnit(Vec2i(i,j), field, unit) == false) {
return false;
}
}
}