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

- bugfix for building units at edges of maps

This commit is contained in:
Mark Vejvoda 2011-02-22 22:25:03 +00:00
parent a06cb541b1
commit 8d8ed75990
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/graphics/renderer.cpp
View File

@ -803,7 +803,8 @@ void Renderer::renderMouse3d() {
glTranslatef(pos3f.x+offset, pos3f.y, pos3f.z+offset);
//choose color
if(map->isFreeCells(pos, building->getSize(), fLand)){
//if(map->isFreeCells(pos, building->getSize(), fLand)){
if(map->isFreeCells(pos + Vec2i(building->getSize()/2, building->getSize()/2), building->getSize(), fLand)){
color= Vec4f(1.f, 1.f, 1.f, 0.5f);
}
else {

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

@ -147,7 +147,9 @@ int Map::getCellArraySize() const {
Cell *Map::getCell(int x, int y) const {
int arrayIndex = y * w + x;
if(arrayIndex >= getCellArraySize()) {
throw runtime_error("arrayIndex >= getCellArraySize(), arrayIndex = " + intToStr(arrayIndex) + " w = " + intToStr(w) + " h = " + intToStr(h));
abort();
//throw runtime_error("arrayIndex >= getCellArraySize(), arrayIndex = " + intToStr(arrayIndex) + " w = " + intToStr(w) + " h = " + intToStr(h));
}
else if(cells == NULL) {
throw runtime_error("cells == NULL");
@ -379,13 +381,14 @@ bool Map::isResourceNear(const Vec2i &pos, int size, const ResourceType *rt, Vec
bool Map::isFreeCell(const Vec2i &pos, Field field) const {
return
isInside(pos) &&
isInsideSurface(toSurfCoords(pos)) &&
getCell(pos)->isFree(field) &&
(field==fAir || getSurfaceCell(toSurfCoords(pos))->isFree()) &&
(field!=fLand || getDeepSubmerged(getCell(pos)) == false);
}
bool Map::isFreeCellOrHasUnit(const Vec2i &pos, Field field, const Unit *unit) const {
if(isInside(pos)) {
if(isInside(pos) && isInsideSurface(toSurfCoords(pos))) {
Cell *c= getCell(pos);
if(c->getUnit(unit->getCurrField()) == unit) {
if(unit->getCurrField() == fAir) {
@ -414,7 +417,7 @@ bool Map::isFreeCellOrHasUnit(const Vec2i &pos, Field field, const Unit *unit) c
}
bool Map::isAproxFreeCell(const Vec2i &pos, Field field, int teamIndex) const {
if(isInside(pos)) {
if(isInside(pos) && isInsideSurface(toSurfCoords(pos))) {
const SurfaceCell *sc= getSurfaceCell(toSurfCoords(pos));
if(sc->isVisible(teamIndex)) {
@ -434,7 +437,8 @@ bool Map::isFreeCells(const Vec2i & pos, int size, Field field) const {
for(int i=pos.x; i<pos.x+size; ++i) {
for(int j=pos.y; j<pos.y+size; ++j) {
Vec2i testPos(i,j);
if(isFreeCell(testPos, field) == false) {
if(isInside(testPos) == false || isInsideSurface(toSurfCoords(testPos)) == false ||
isFreeCell(testPos, field) == false) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] isFreeCell will return false, testPos = %s, field = %d, getCell(testPos)->isFree(field) = %d, getSurfaceCell(toSurfCoords(testPos))->isFree() = %d, getDeepSubmerged(getCell(testPos)) = %d\n",__FILE__,__FUNCTION__,__LINE__,testPos.getString().c_str(),field,getCell(testPos)->isFree(field),getSurfaceCell(toSurfCoords(testPos))->isFree(),getDeepSubmerged(getCell(testPos)));
return false;
}
@ -473,14 +477,20 @@ bool Map::isAproxFreeCells(const Vec2i &pos, int size, Field field, int teamInde
}
bool Map::canOccupy(const Vec2i &pos, Field field, const UnitType *ut, CardinalDir facing) {
if (ut->hasCellMap()) {
if (ut->hasCellMap() && isInside(pos) && isInsideSurface(toSurfCoords(pos))) {
for (int y=0; y < ut->getSize(); ++y) {
for (int x=0; x < ut->getSize(); ++x) {
if (ut->getCellMapCell(x, y, facing)) {
if (isFreeCell(pos + Vec2i(x, y), field) == false) {
return false;
Vec2i cellPos = pos + Vec2i(x, y);
if(isInside(cellPos) && isInsideSurface(toSurfCoords(cellPos))) {
if (ut->getCellMapCell(x, y, facing)) {
if (isFreeCell(cellPos, field) == false) {
return false;
}
}
}
else {
false;
}
}
}
return true;
@ -818,14 +828,16 @@ bool Map::isInUnitTypeCells(const UnitType *ut, const Vec2i &pos,
throw runtime_error("ut == NULL");
}
Cell *testCell = getCell(testPos);
for(int i=0; i < ut->getSize(); ++i){
for(int j = 0; j < ut->getSize(); ++j) {
Vec2i currPos = pos + Vec2i(i, j);
if(isInside(currPos) == true) {
Cell *unitCell = getCell(currPos);
if(unitCell == testCell) {
return true;
if(isInside(testPos) && isInsideSurface(toSurfCoords(testPos))) {
Cell *testCell = getCell(testPos);
for(int i=0; i < ut->getSize(); ++i){
for(int j = 0; j < ut->getSize(); ++j) {
Vec2i currPos = pos + Vec2i(i, j);
if(isInside(currPos) && isInsideSurface(toSurfCoords(currPos))) {
Cell *unitCell = getCell(currPos);
if(unitCell == testCell) {
return true;
}
}
}
}

4
source/glest_game/world/unit_updater.cpp
View File

@ -574,7 +574,9 @@ void UnitUpdater::updateBuild(Unit *unit) {
switch(this->game->getGameSettings()->getPathFinderType()) {
case pfBasic:
SystemFlags::OutputDebug(SystemFlags::debugUnitCommands,"In [%s::%s Line: %d] tsArrived about to call map->isFreeCells() for command->getPos() = %s, ut->getSize() = %d\n",__FILE__,__FUNCTION__,__LINE__,command->getPos().getString().c_str(),ut->getSize());
canOccupyCell = map->isFreeCells(command->getPos(), ut->getSize(), fLand);
//canOccupyCell = map->isFreeCells(command->getPos(), ut->getSize(), fLand);
//!!!return pos + Vec2i(type->getSize()/2, type->getSize()/2);
canOccupyCell = map->isFreeCells(command->getPos() + Vec2i(ut->getSize()/2, ut->getSize()/2), ut->getSize(), fLand);
break;
case pfRoutePlanner:
canOccupyCell = map->canOccupy(command->getPos(), ut->getField(), ut, command->getFacing());