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

- bugfix for invalid map co-ordinates when looking for resources

This commit is contained in:
Mark Vejvoda 2010-10-26 15:25:38 +00:00
parent 1e104f0496
commit 43670f76c9
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/glest_game/type_instances/faction.cpp
View File

@ -736,7 +736,7 @@ Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceT
for(int j = -harvestDistance; j <= harvestDistance && foundCloseResource == false; ++j) {
for(int k = -harvestDistance; k <= harvestDistance && foundCloseResource == false; ++k) {
Vec2i newPos = pos + Vec2i(j,k);
if(isResourceTargetInCache(newPos) == false) {
if(map->isInside(newPos) == true && isResourceTargetInCache(newPos) == false) {
const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(newPos));
if( sc != NULL && sc->getResource() != NULL) {
const Resource *resource = sc->getResource();
@ -763,21 +763,26 @@ Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceT
iter != cacheResourceTargetList.end() && foundCloseResource == false;
++iter) {
const Vec2i &cache = iter->first;
const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(cache));
if( sc != NULL && sc->getResource() != NULL) {
const Resource *resource = sc->getResource();
if(resource->getType() != NULL && resource->getType() == type) {
if(result.x < 0 || unit->getPos().dist(cache) < unit->getPos().dist(result)) {
if(unit->isBadHarvestPos(cache) == false) {
result = cache;
// Close enough to our position, no more looking
if(unit->getPos().dist(result) <= (harvestDistance * 2)) {
foundCloseResource = true;
break;
if(map->isInside(cache) == true) {
const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(cache));
if( sc != NULL && sc->getResource() != NULL) {
const Resource *resource = sc->getResource();
if(resource->getType() != NULL && resource->getType() == type) {
if(result.x < 0 || unit->getPos().dist(cache) < unit->getPos().dist(result)) {
if(unit->isBadHarvestPos(cache) == false) {
result = cache;
// Close enough to our position, no more looking
if(unit->getPos().dist(result) <= (harvestDistance * 2)) {
foundCloseResource = true;
break;
}
}
}
}
}
else {
deleteList.push_back(cache);
}
}
else {
deleteList.push_back(cache);