* Aircraft state was not being transferred ciclically from Game to Aircraft module.

* Improved detection of target reaching for Aircraft.c.
* Cursor is now displayed correctly on both 1-player and 2-player mode.
* Fixed behaviour for locking/unlocking aircraft.
* Fixed menus for 2-player mode.
* Minor fixes and improvements.

1 files changed, 135 insertions, 91 deletions

diff --git a/Source/Aircraft.c b/Source/Aircraft.c
index fb2b516..3b3dab8 100644
--- a/Source/Aircraft.c
+++ b/Source/Aircraft.c
@@ -13,14 +13,14 @@
 /* *************************************

  * 	Structs and enums

  * *************************************/

- 

+

 enum

 {

 	AIRCRAFT_SPRITE_SIZE = 24,

 	AIRCRAFT_SPRITE_VRAM_X = 800,

 	AIRCRAFT_SPRITE_VRAM_Y = 304,

-}; 

- 

+};

+

 enum

 {

 	PHX_LIVERY_CLUT_X = 384,

@@ -33,7 +33,8 @@ typedef enum t_aircraftSpeeds
 	AIRCRAFT_SPEED_TAXIING,

 	AIRCRAFT_SPEED_APPROACH,

 	AIRCRAFT_SPEED_TAKEOFF,

-	AIRCRAFT_SPEED_DESCENT,

+	AIRCRAFT_SPEED_FINAL,

+	AIRCRAFT_SPEED_FINAL_Z,

 }AIRCRAFT_SPEEDS;

 

 /* *************************************

@@ -47,12 +48,12 @@ static TYPE_ISOMETRIC_POS AircraftCenterIsoPos;
 static TYPE_CARTESIAN_POS AircraftCenterPos;

 static char * AircraftLiveryNamesTable[] = {"PHX", NULL};

 static AIRCRAFT_LIVERY AircraftLiveryTable[] = {AIRCRAFT_LIVERY_0, AIRCRAFT_LIVERY_UNKNOWN};

-static const fix16_t AircraftSpeedsTable[] = {	0			/* IDLE */		,

-												0x3333		/* TAXIING */	,

-												0x00010000	/* APPROACH */	,

-												0x20000		/* TAKEOFF	*/	,

-												0x8000		/* DESCENT	*/	};

-																	 

+static const fix16_t AircraftSpeedsTable[] = {	[AIRCRAFT_SPEED_IDLE] = 0,

+												[AIRCRAFT_SPEED_TAXIING] = 0x6666,

+												[AIRCRAFT_SPEED_TAKEOFF] = 0x20000,

+												[AIRCRAFT_SPEED_FINAL] = 0x10000,

+												[AIRCRAFT_SPEED_FINAL_Z] = 0x4000	};

+

 /* *************************************

  * 	Local prototypes

  * *************************************/

@@ -67,61 +68,61 @@ void AircraftInit(void)
 {

 	bzero(AircraftData, GAME_MAX_AIRCRAFT * sizeof(TYPE_AIRCRAFT_DATA));

 	AircraftIndex = 0;

-	

+

 	AircraftSpr.x = 0;

 	AircraftSpr.y = 0;

-	

+

 	AircraftSpr.attribute = COLORMODE(COLORMODE_8BPP);

-	

+

 	AircraftSpr.cx = PHX_LIVERY_CLUT_X;

 	AircraftSpr.cy = PHX_LIVERY_CLUT_Y;

-	

+

 	AircraftSpr.w = AIRCRAFT_SPRITE_SIZE;

 	AircraftSpr.h = AIRCRAFT_SPRITE_SIZE;

-	

+

 	/*AircraftSpr.tpage = 28;

 	AircraftSpr.u = 64;

 	AircraftSpr.v = 48;*/

-	

+

 	GfxTPageOffsetFromVRAMPosition(&AircraftSpr, AIRCRAFT_SPRITE_VRAM_X, AIRCRAFT_SPRITE_VRAM_Y);

-	

+

 	AircraftCenterIsoPos.x = AIRCRAFT_SIZE >> 1;

 	AircraftCenterIsoPos.y = AIRCRAFT_SIZE >> 1;

 	AircraftCenterIsoPos.z = 0;

-	

+

 	AircraftCenterPos = GfxIsometricToCartesian(&AircraftCenterIsoPos);

 }

 

 bool AircraftAddNew(	TYPE_FLIGHT_DATA * ptrFlightData,

 						uint8_t FlightDataIndex,

-						uint16_t * targets		)

+						uint16_t* targets		)

 {

 	TYPE_AIRCRAFT_DATA* ptrAircraft = &AircraftData[AircraftIndex];

 	uint8_t level_columns = GameGetLevelColumns();

 	uint8_t i;

-	

+

 	if(AircraftIndex >= GAME_MAX_AIRCRAFT)

 	{

 		dprintf("Exceeded maximum aircraft capacity!\n");

 		return false;

 	}

-	

+

 	memcpy(ptrAircraft->Target, targets, sizeof(uint16_t) * AIRCRAFT_MAX_TARGETS);

-	

+

 	ptrAircraft->TargetIdx = 0;

 	ptrAircraft->Livery = AircraftLiveryFromFlightNumber(ptrFlightData->strFlightNumber[FlightDataIndex]);

-	

+

 	ptrAircraft->FlightDataIdx = FlightDataIndex;

-	

+

 	if(ptrFlightData->FlightDirection[FlightDataIndex] == ARRIVAL)

 	{

 		ptrAircraft->IsoPos.x = 0;

-		

+

 		ptrAircraft->IsoPos.y = targets[0] / level_columns;

 		ptrAircraft->IsoPos.y <<= TILE_SIZE_BIT_SHIFT;

 		ptrAircraft->IsoPos.y += TILE_SIZE >> 1; // Adjust to tile center

 		ptrAircraft->IsoPos.y = fix16_from_int(ptrAircraft->IsoPos.y);

-		

+

 		ptrAircraft->IsoPos.z = targets[0] % level_columns;

 		ptrAircraft->IsoPos.z <<= TILE_SIZE_BIT_SHIFT - 1;

 		ptrAircraft->IsoPos.z = fix16_from_int(ptrAircraft->IsoPos.z);

@@ -132,31 +133,33 @@ bool AircraftAddNew(	TYPE_FLIGHT_DATA * ptrFlightData,
 		ptrAircraft->IsoPos.y = GameGetYFromTile(ptrFlightData->Parking[FlightDataIndex]);

 		ptrAircraft->IsoPos.z = 0;

 	}

-	

+

 	ptrAircraft->State = ptrFlightData->State[FlightDataIndex];

-	

+

+	ptrAircraft->Direction = AIRCRAFT_DIR_NORTH; // Default to north direction

+

 	dprintf("\nAircraft Data:\n");

 	dprintf("\tTargets:");

-	

+

 	for(i = 0; i < AIRCRAFT_MAX_TARGETS; i++)

 	{

 		if(ptrAircraft->Target[i] == 0)

 		{

 			break;

 		}

-		

+

 		dprintf(" %d", ptrAircraft->Target[i]);

 	}

-	

+

 	dprintf("\nLivery: %d\n",	ptrAircraft->Livery	);

-			

+

 	dprintf("Aircraft position: {%d, %d, %d}\n",

 			fix16_to_int(ptrAircraft->IsoPos.x),

 			fix16_to_int(ptrAircraft->IsoPos.y),

 			fix16_to_int(ptrAircraft->IsoPos.z)	);

-	

+

 	AircraftIndex++;

-	

+

 	return true;

 }

 

@@ -164,18 +167,18 @@ AIRCRAFT_LIVERY AircraftLiveryFromFlightNumber(char * strFlightNumber)
 {

 	int32_t liveryIndex;

 	char strLivery[4];

-	

+

 	memset(strLivery, 0, 4 * sizeof(char) );

-	

+

 	strncpy(strLivery, strFlightNumber, 3);

-	

+

 	liveryIndex = SystemIndexOfStringArray(strLivery, AircraftLiveryNamesTable);

-	

+

 	if(liveryIndex == -1)

 	{

 		return AIRCRAFT_LIVERY_UNKNOWN;

 	}

-	

+

 	return AircraftLiveryTable[liveryIndex];

 }

 

@@ -183,19 +186,21 @@ void AircraftHandler(void)
 {

 	TYPE_AIRCRAFT_DATA* ptrAircraft;

 	uint8_t i;

-	

+

 	for(i = 0; i < GAME_MAX_AIRCRAFT; i++)

 	{

 		ptrAircraft = &AircraftData[i];

-		

+

 		if(ptrAircraft->State == STATE_IDLE)

 		{

 			continue;

 		}

-		

+

 		AircraftDirection(ptrAircraft);

 		AircraftAttitude(ptrAircraft);

 		AircraftSpeed(ptrAircraft);

+

+		ptrAircraft->State = GameGetFlightDataStateFromIdx(ptrAircraft->FlightDataIdx);

 	}

 }

 

@@ -204,20 +209,23 @@ void AircraftSpeed(TYPE_AIRCRAFT_DATA* ptrAircraft)
 	switch(ptrAircraft->State)

 	{

 		case STATE_FINAL:

-			ptrAircraft->Speed = AircraftSpeedsTable[AIRCRAFT_SPEED_DESCENT];

+			ptrAircraft->Speed = AircraftSpeedsTable[AIRCRAFT_SPEED_FINAL];

 		break;

-		

+

 		case STATE_TAKEOFF:

 			ptrAircraft->Speed = AircraftSpeedsTable[AIRCRAFT_SPEED_TAKEOFF];

 		break;

-		

+

 		case STATE_TAXIING:

 			ptrAircraft->Speed = AircraftSpeedsTable[AIRCRAFT_SPEED_TAXIING];

 		break;

-		

+

 		case STATE_UNBOARDING:

+			// Fall through

 		case STATE_IDLE:

+			// Fall through

 		case STATE_LANDED:

+			// Fall through

 		default:

 			ptrAircraft->Speed = 0;

 		break;

@@ -228,32 +236,32 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer)
 {

 	TYPE_AIRCRAFT_DATA* ptrAircraft;

 	TYPE_CARTESIAN_POS cartPos;

-	

+

 	uint8_t i;

-	

+

 	for(i = 0; i < GAME_MAX_AIRCRAFT; i++)

 	{

 		ptrAircraft = &AircraftData[i];

-		

+

 		if(ptrAircraft->State == STATE_IDLE)

 		{

 			continue;

 		}

-		

+

 		cartPos = GfxIsometricFix16ToCartesian(&ptrAircraft->IsoPos);

-		

+

 		// Aircraft position is referred to aircraft center

 		AircraftSpr.x = cartPos.x - (AircraftSpr.w >> 1);

 		AircraftSpr.y = cartPos.y - (AircraftSpr.h >> 1);

-		

+

 		AircraftUpdateSpriteFromData(ptrAircraft);

-		

+

 		CameraApplyCoordinatesToSprite(ptrPlayer, &AircraftSpr);

-		

+

 		AircraftSpr.r = NORMAL_LUMINANCE;

 		AircraftSpr.g = NORMAL_LUMINANCE;

 		AircraftSpr.b = NORMAL_LUMINANCE;

-		

+

 		GfxSortSprite(&AircraftSpr);

 	}

 }

@@ -261,62 +269,90 @@ void AircraftRender(TYPE_PLAYER* ptrPlayer)
 void AircraftDirection(TYPE_AIRCRAFT_DATA* ptrAircraft)

 {

 	TYPE_ISOMETRIC_FIX16_POS targetPos;

-	

+

 	if(ptrAircraft->Target[ptrAircraft->TargetIdx] == 0)

 	{

 		return;

 	}

-	

+

 	targetPos.x = GameGetXFromTile(ptrAircraft->Target[ptrAircraft->TargetIdx]);

 	targetPos.y = GameGetYFromTile(ptrAircraft->Target[ptrAircraft->TargetIdx]);

 	targetPos.z = 0;

-	

+

 	ptrAircraft->TargetReached = false;

-	

+

 	if(targetPos.y == ptrAircraft->IsoPos.y)

 	{

 		if(targetPos.x > ptrAircraft->IsoPos.x)

 		{

-			ptrAircraft->Direction = AIRCRAFT_DIR_EAST;

-			ptrAircraft->IsoPos.x += ptrAircraft->Speed;

+			if(targetPos.x <= (ptrAircraft->IsoPos.x + ptrAircraft->Speed) )

+			{

+				ptrAircraft->TargetReached = true;

+			}

+			else

+			{

+				ptrAircraft->Direction = AIRCRAFT_DIR_EAST;

+				ptrAircraft->IsoPos.x += ptrAircraft->Speed;

+			}

 		}

 		else if(targetPos.x < ptrAircraft->IsoPos.x)

 		{

-			ptrAircraft->Direction = AIRCRAFT_DIR_WEST;

-			ptrAircraft->IsoPos.x -= ptrAircraft->Speed;

+			if(targetPos.x >= (ptrAircraft->IsoPos.x - ptrAircraft->Speed) )

+			{

+				ptrAircraft->TargetReached = true;

+			}

+			else

+			{

+				ptrAircraft->Direction = AIRCRAFT_DIR_WEST;

+				ptrAircraft->IsoPos.x -= ptrAircraft->Speed;

+			}

 		}

 		else

 		{

 			ptrAircraft->TargetReached = true;

-			

-			if(ptrAircraft->Target[++ptrAircraft->TargetIdx] == 0)

-			{

-				dprintf("All targets reached!\n");

-				GameTargetsReached(ptrAircraft->FlightDataIdx);

-			}

 		}

 	}

 	else if(targetPos.x == ptrAircraft->IsoPos.x)

 	{

 		if(targetPos.y > ptrAircraft->IsoPos.y)

 		{

-			ptrAircraft->Direction = AIRCRAFT_DIR_SOUTH;

-			ptrAircraft->IsoPos.y += ptrAircraft->Speed;

+			if(targetPos.y <= (ptrAircraft->IsoPos.y + ptrAircraft->Speed) )

+			{

+				ptrAircraft->TargetReached = true;

+			}

+			else

+			{

+				ptrAircraft->Direction = AIRCRAFT_DIR_SOUTH;

+				ptrAircraft->IsoPos.y += ptrAircraft->Speed;

+			}

 		}

 		else if(targetPos.y < ptrAircraft->IsoPos.y)

 		{

-			ptrAircraft->Direction = AIRCRAFT_DIR_NORTH;

-			ptrAircraft->IsoPos.y -= ptrAircraft->Speed;

+			if(targetPos.y >= (ptrAircraft->IsoPos.y - ptrAircraft->Speed) )

+			{

+				ptrAircraft->TargetReached = true;

+			}

+			else

+			{

+				ptrAircraft->Direction = AIRCRAFT_DIR_NORTH;

+				ptrAircraft->IsoPos.y -= ptrAircraft->Speed;

+			}

 		}

 		else

 		{

 			ptrAircraft->TargetReached = true;

-			

-			if(ptrAircraft->Target[++ptrAircraft->TargetIdx] == 0)

-			{

-				dprintf("All targets reached!\n");

-				ptrAircraft->State = GameTargetsReached(ptrAircraft->FlightDataIdx);

-			}

+		}

+	}

+

+	if(ptrAircraft->TargetReached == true)

+	{

+		ptrAircraft->IsoPos.x = targetPos.x;

+		ptrAircraft->IsoPos.y = targetPos.y;

+		

+		if(ptrAircraft->Target[++ptrAircraft->TargetIdx] == 0)

+		{

+			dprintf("All targets reached!\n");

+			ptrAircraft->State = GameTargetsReached(ptrAircraft->FlightDataIdx);

 		}

 	}

 }

@@ -329,35 +365,43 @@ void AircraftUpdateSpriteFromData(TYPE_AIRCRAFT_DATA* ptrAircraft)
 			AircraftSpr.cx = PHX_LIVERY_CLUT_X;

 			AircraftSpr.cy = PHX_LIVERY_CLUT_Y;

 		break;

-		

+

 		case AIRCRAFT_LIVERY_UNKNOWN:

 			// Fall through

 		default:

 			dprintf("Unknown livery %d!\n", ptrAircraft->Livery);

 		break;

 	}

-	

+

 	// Reset TPAGE and {U, V} offset first.

 	GfxTPageOffsetFromVRAMPosition(&AircraftSpr, AIRCRAFT_SPRITE_VRAM_X, AIRCRAFT_SPRITE_VRAM_Y);

-	

+

 	switch(ptrAircraft->Direction)

 	{

 		case AIRCRAFT_DIR_NORTH:

 			AircraftSpr.v += AircraftSpr.w;

 			AircraftSpr.attribute |= H_FLIP;

 		break;

+

 		case AIRCRAFT_DIR_SOUTH:

 			AircraftSpr.v += 0;

 			AircraftSpr.attribute |= H_FLIP;

 		break;

+

 		case AIRCRAFT_DIR_EAST:

 			AircraftSpr.v += 0;

 			AircraftSpr.attribute &= ~(H_FLIP);

 		break;

+

 		case AIRCRAFT_DIR_WEST:

 			AircraftSpr.v += AircraftSpr.w;

 			AircraftSpr.attribute &= ~(H_FLIP);

 		break;

+

+		case AIRCRAFT_DIR_NO_DIRECTION:

+			// Fall through

+		default:

+		break;

 	}

 }

 

@@ -367,7 +411,7 @@ void AircraftAttitude(TYPE_AIRCRAFT_DATA* ptrAircraft)
 	{

 		if(ptrAircraft->IsoPos.z > 0)

 		{

-			ptrAircraft->IsoPos.z -= AircraftSpeedsTable[AIRCRAFT_SPEED_DESCENT];

+			ptrAircraft->IsoPos.z -= AircraftSpeedsTable[AIRCRAFT_SPEED_FINAL_Z];

 		}

 	}

 }

@@ -378,16 +422,16 @@ TYPE_ISOMETRIC_POS AircraftGetIsoPos(uint8_t FlightDataIdx)
 	// So we must perform a conversion first for convenience.

 	TYPE_ISOMETRIC_POS retIsoPos;

 	TYPE_ISOMETRIC_FIX16_POS fix16IsoPos = AircraftFromFlightDataIndex(FlightDataIdx)->IsoPos;

-	

+

 	retIsoPos.x = (short)fix16_to_int(fix16IsoPos.x);

 	retIsoPos.y = (short)fix16_to_int(fix16IsoPos.y);

 	retIsoPos.z = (short)fix16_to_int(fix16IsoPos.z);

-	

+

 	return retIsoPos;

 }

 

-void AircraftAddTargets(TYPE_AIRCRAFT_DATA* ptrAircraft, uint16_t * targets)

-{	

+void AircraftAddTargets(TYPE_AIRCRAFT_DATA* ptrAircraft, uint16_t* targets)

+{

 	memcpy(ptrAircraft->Target, targets, sizeof(uint16_t) * AIRCRAFT_MAX_TARGETS);

 }

 

@@ -401,21 +445,21 @@ TYPE_AIRCRAFT_DATA* AircraftFromFlightDataIndex(uint8_t index)
 {

 	uint8_t i;

 	TYPE_AIRCRAFT_DATA* ptrAircraft;

-	

+

 	for(i = 0; i < GAME_MAX_AIRCRAFT; i++)

 	{

 		ptrAircraft = &AircraftData[i];

-		

+

 		if(ptrAircraft->FlightDataIdx == index)

 		{

 			return ptrAircraft;

 		}

 	}

-	

+

 	return NULL;

 }

 

-void AircraftFromFlightDataIndexAddTargets(uint8_t index, uint16_t * targets)

+void AircraftFromFlightDataIndexAddTargets(uint8_t index, uint16_t* targets)

 {

 	AircraftAddTargets(AircraftFromFlightDataIndex(index), targets);

 }