Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up #663

Merged
merged 4 commits into from
May 2, 2024
Merged

Clean up #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
473fb74
Clean up:
Jarod42 May 2, 2024
8bc782e
Replace output parameters of `GetMissileMapArea`.
Jarod42 May 2, 2024
0a13a78
Replace output parameter of `FindTerrainType`.
Jarod42 May 2, 2024
f3d3688
Fix comment about out parameter.
Jarod42 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions src/action/action_resource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,16 +389,15 @@ bool COrder_Resource::OnAiHitUnit(CUnit &unit, CUnit *attacker, int /* damage*/)
*/
int COrder_Resource::MoveToResource_Terrain(CUnit &unit)
{
Vec2i pos = this->goalPos;

// Wood gone, look somewhere else.
if ((Map.Info.IsPointOnMap(pos) == false || Map.Field(pos)->IsTerrainResourceOnMap(CurrentResource) == false)
if ((Map.Info.IsPointOnMap(this->goalPos) == false
|| Map.Field(this->goalPos)->IsTerrainResourceOnMap(CurrentResource) == false)
&& (!unit.IX) && (!unit.IY)) {
if (!FindTerrainType(unit.Type->MovementMask, MapFieldForest, 16, *unit.Player, this->goalPos, &pos)) {
if (auto pos = FindTerrainType(unit.Type->MovementMask, MapFieldForest, 16, *unit.Player, this->goalPos)) {
this->goalPos = *pos;
} else {
// no wood in range
return -1;
} else {
this->goalPos = pos;
}
}
switch (DoActionMove(unit)) {
Expand All @@ -411,12 +410,14 @@ int COrder_Resource::MoveToResource_Terrain(CUnit &unit)
AiCanNotMove(unit);
}
}
if (FindTerrainType(unit.Type->MovementMask, MapFieldForest, 9999, *unit.Player, unit.tilePos, &pos)) {
this->goalPos = pos;
DebugPrint("Found a better place to harvest %d,%d\n", pos.x, pos.y);
// FIXME: can't this overflow? It really shouldn't, since
// x and y are really supossed to be reachable, checked thorugh a flood fill.
// I don't know, sometimes stuff happens.
if (auto pos = FindTerrainType(
unit.Type->MovementMask, MapFieldForest, 9999, *unit.Player, unit.tilePos)) {
this->goalPos = *pos;
DebugPrint("Found a better place to harvest %d,%d\n", pos->x, pos->y);
// FIXME: can't this overflow? It really shouldn't,
// since x and y are really supposed to be reachable,
// checked through a flood fill.
// I don't know, sometime stuff happens.
return 0;
}
return -1;
Expand Down Expand Up @@ -1091,13 +1092,11 @@ bool COrder_Resource::WaitInDepot(CUnit &unit)

// Range hardcoded. don't stray too far though
if (resinfo.TerrainHarvester) {
Vec2i pos = this->Resource.Pos;

if (FindTerrainType(unit.Type->MovementMask, MapFieldForest, 10, *unit.Player, pos, &pos)) {
if (auto pos = FindTerrainType(unit.Type->MovementMask, MapFieldForest, 10, *unit.Player, this->Resource.Pos)) {
if (depot) {
DropOutNearest(unit, pos, depot);
DropOutNearest(unit, *pos, depot);
}
this->goalPos = pos;
this->goalPos = *pos;
} else {
if (depot) {
DropOutOnSide(unit, LookingW, depot);
Expand Down Expand Up @@ -1140,8 +1139,6 @@ bool COrder_Resource::WaitInDepot(CUnit &unit)
goal = UnitFindResource(unit, (start_unit ? *start_unit : unit), 1000, this->CurrentResource,
unit.Player->AiEnabled, (newdepot ? newdepot : depot));
}


}

if (goal) {
Expand Down Expand Up @@ -1247,11 +1244,10 @@ bool COrder_Resource::FindAnotherResource(CUnit &unit)
return true;
}
} else {
Vec2i resPos;
if (FindTerrainType(unit.Type->MovementMask, MapFieldForest, 8, *unit.Player, unit.tilePos, &resPos)) {
this->goalPos = resPos;
if (auto resPos = FindTerrainType(unit.Type->MovementMask, MapFieldForest, 8, *unit.Player, unit.tilePos)) {
this->goalPos = *resPos;
this->State = SUB_MOVE_TO_RESOURCE;
DebugPrint("Found a better place to harvest %d,%d\n", resPos.x, resPos.y);
DebugPrint("Found a better place to harvest %d,%d\n", resPos->x, resPos->y);
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/action/actions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void COrder::UpdatePathFinderData_NotCalled(PathFinderInput &input)
** Parse order
**
** @param l Lua state.
** @param order OUT: resulting order.
** @return resulting order.
*/
std::unique_ptr<COrder> CclParseOrder(lua_State *l, CUnit &unit)
{
Expand Down
Loading
Loading