Skyrider claims having no chopper after landing in Estoni.

[misanthropos]

What is wrong

I landed in Estoni with Hitman to pick up Maddog and buy some stuff. The central SAM site is mine and I had no problem landing.
First I noticed there was no Heli to board anymore. Anyhow on the map you can click the chopper and Skyrider claims he has lost his vehicle.

JA2S version	Game version	Vanilla bug?	Used to work?
release/git	eg. JA2 Gold Dutch	yes/no	yes/no
QuickSave.sav.gz
commit f571f92 (HEAD -> master, origin/master, origin/HEAD)
Merge: 7d66aa4 54799c6

Vanilla: no
Used to work.

savegame attached.

linux

[misanthropos]

I believe the problem is loyalty in Estoni - but is this intended? I mean the central SAM site is mine. Same for Alma and Cambria and Drassen is 100%.
This might be related to being able to train militia in Estoni. That was not possible in vanilla i think.

[misanthropos]

I found the problem: Somehow that Sector seems to be EnemyControlled - thats why
CanHelicopterTakeOff returns FALSE.... using gdb I changed that sector to not enemy controlled and I can continue.

[misanthropos]

But Skyrider should never have been able to land there in the first place if its still occupied...

[JAsmine-ja2]

You can fix the situation by fighting (and winning ;) a battle in Estoni. The shopper gets displayed in tactical view and works as intended.
This savegame has the situation fixed by this method.
SaveGame01.zip

[ja2-derek]

I think I found some clues.

First of all, every sector is initialized as fEnemyControlled = TRUE when campaign starts:

ja2-stracciatella/src/game/Strategic/StrategicMap.cc

Lines 2344 to 2348 in f288e5d

	// Set all sectors as enemy controlled.
	FOR_EACH(StrategicMapElement, i, StrategicMap)
	{
	i->fEnemyControlled = TRUE;
	}

When a squad enters a sector, it should set fEnemyControlled to false, if there are no enemies present.

ja2-stracciatella/src/game/Strategic/Strategic_Movement.cc

Lines 1438 to 1442 in 99df5bc

	bool const is_heli_group = g.fVehicle && IsGroupTheHelicopterGroup(g);
	if (!is_heli_group)
	{ // Take control of sector
	SetThisSectorAsPlayerControlled(g.ubSectorX, g.ubSectorY, g.ubSectorZ, FALSE);
	}

See the code above. If you never entered Estoni I6 on foot before, it will stay as fEnemyControlled. So I loaded the QuickSave, and ordered the squad to leave and a few minutes later re-enter I6, the issue is resolved. Fighting an enemy in sector is not necessary.

is_heli_group should only check for a flying heli group, not a landed heli group. Landed heli should be treated the same as a squad on foot.

Another observation is: the heli automatically lands upon arrival in I6, even refueling is not yet enabled, and sector is marked as enemy controlled sector,

[ja2-derek]

I suspect it is this commmit - f374ac7

The commit replaces CheckForArrivalAtRefuelPoint with IsRefuelSiteInSector, but IsRefuelSiteInSector does not consider if the refuel site is enabled (fRefuelingSiteAvailable)