Lines showing vehicle destination only appear after vehicle begins moving

[dethstryke01]

In the original they appeared as soon as the order to move had been given.

In OpenApoc:

https://youtu.be/ICiHQ0unP1k?t=1800

In the original:

https://youtu.be/T-XUNuXMzkM?t=29

OpenApoc 20240410
Extended Weapons Mod 9.01
Falcon Weapons Platform 1.4
Windows 10 22H2
OpenApoc_settings.zip

[ayrtondenner]

I tried to fix this issue but didn't have success on it, so I'm sharing my attempt to help anyone else that might try to work on it as well. I looked it up and debugged with two vehicles sending both to a building (one in the open and another inside a base). In both cases targetLocationsToDraw is empty, but here's the difference:

• When already in the open, the vehicle has two missions: GotoLocation and GotoBuilding. GotoLocation mission will then add a Vec3 in targetLocationsToDraw.
• When in a building, the vehicle also has two missions: TakeOff and GotoBuilding. The problem is that neither mission add an item in targetLocationsToDraw.

I ended up finding that at missions.start(), TakeOff mission is blocking the GotoLocation mission: because if takeOffCheck() returns True, then start() will quit. What I'm doing is that, instead of quitting, start() function will continue executing, where it will calculate shortest path pad, and add GotoLocation mission.

In short, I tried the following two changes:

1):

OpenApoc/game/state/city/vehiclemission.cpp

Lines 1985 to 2009 in 053426e

	case MissionType::AttackBuilding:
	{
	if (!targetBuilding && !acquireTargetBuilding(state, v))
	{
	cancelled = true;
	return;
	}
	if (takeOffCheck(state, v))
	{
	return;
	}
	if (this->currentPlannedPath.empty())
	{
	std::uniform_int_distribution<int> xPos(targetBuilding->bounds.p0.x - 5,
	targetBuilding->bounds.p1.x + 5);
	std::uniform_int_distribution<int> yPos(targetBuilding->bounds.p0.y - 5,
	targetBuilding->bounds.p1.y + 5);
	setPathTo(state, v, v.getPreferredPosition(xPos(state.rng), yPos(state.rng)),
	getDefaultIterationCount(v));
	}
	return;
	}

This was replaced with:

case MissionType::AttackBuilding:
{
	if (!targetBuilding && !acquireTargetBuilding(state, v))
	{
		cancelled = true;
		return;
	}


	takeOffCheck(state, v);


	if (this->currentPlannedPath.empty())
	{
		std::uniform_int_distribution<int> xPos(targetBuilding->bounds.p0.x - 5, targetBuilding->bounds.p1.x + 5);
		std::uniform_int_distribution<int> yPos(targetBuilding->bounds.p0.y - 5, targetBuilding->bounds.p1.y + 5);
		setPathTo(state, v, v.getPreferredPosition(xPos(state.rng), yPos(state.rng)), getDefaultIterationCount(v));
	}


	return;
}

2):

OpenApoc/game/state/city/vehiclemission.cpp

Lines 2102 to 2109 in 053426e

	// Leave building
	if (takeOffCheck(state, v))
	{
	return;
	}
	// Actually go there
	auto vehicleTile = v.tileObject;
	if (v.type->isGround())

Again removed return from takeOffCheck, and I also added a check to deal with occasions where vehicleTile is empty, which was something that didn't happen before since takeOffCheck return would stop code execution before hitting this line:

// Leave building
auto takeOffCheckResult = takeOffCheck(state, v);

// Actually go there
auto vehicleTile = v.tileObject;

if (takeOffCheckResult && !vehicleTile)
	return;

if (v.type->isGround())
{

As you can see, in both cases I removed the return when takeOffCheck was executed, so that way after adding TakeOff we are forcing that vehicle missions list would also have GotoLocation mission as well.

This worked... but then introduced another issue. For some reason, now vehicle->currentBuilding is being set as null. I understand that the TakeOff is doing that, but something that should be setting the currentBuilding back when investigating a building is not working anymore.

To be more specific, when you have a "Live Alien spotted" incident and you send a vehicle with agents to investigate the building where it happened, the following line will throw an error when the vehicles reach the building destination, since v.currentBuilding is null now for some reason:

OpenApoc/game/state/city/vehiclemission.cpp

Line 1449 in 053426e

if (finished && v.owner == state.getPlayer() && v.currentBuilding->detected)