diff options
| author | Xavier ASUS <xavi92psx@gmail.com> | 2018-11-24 13:03:52 +0100 |
|---|---|---|
| committer | Xavier ASUS <xavi92psx@gmail.com> | 2018-11-24 13:03:52 +0100 |
| commit | 6c687dd30b552d646c87c2361394a1183ef5281a (patch) | |
| tree | 68fc377c007f7eb38c2c72c120391da0e50e1b7e /Source/Aircraft.c | |
| parent | ce0027e87fe9be70000e53f52f185321bae3e35e (diff) | |
New LEVEL3.
Improvements.
Diffstat (limited to 'Source/Aircraft.c')
| -rw-r--r-- | Source/Aircraft.c | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/Source/Aircraft.c b/Source/Aircraft.c index f2727a4..211f57e 100644 --- a/Source/Aircraft.c +++ b/Source/Aircraft.c @@ -58,20 +58,17 @@ static TYPE_CARTESIAN_POS AircraftCenterPos; static char* AircraftLiveryNamesTable[] = {"PHX", NULL};
static AIRCRAFT_LIVERY AircraftLiveryTable[] = {AIRCRAFT_LIVERY_0, AIRCRAFT_LIVERY_UNKNOWN};
-static const char* GameFileList[] = { "DATA\\SPRITES\\UDNARROW.TIM",
- "DATA\\SPRITES\\LFRARROW.TIM" };
-
-static void* GameFileDest[] = { (GsSprite*)&UpDownArrowSpr,
- (GsSprite*)&LeftRightArrowSpr };
-
// Used to quickly link FlightData indexes against AircraftData indexes.
static uint8_t flightDataIdxTable[GAME_MAX_AIRCRAFT];
-static const fix16_t AircraftSpeedsTable[] = { [AIRCRAFT_SPEED_IDLE] = 0,
- [AIRCRAFT_SPEED_GROUND] = 0x9999,
- [AIRCRAFT_SPEED_TAKEOFF] = 0x20000,
- [AIRCRAFT_SPEED_FINAL] = 0x10000,
- [AIRCRAFT_SPEED_FINAL_Z] = 0x4000 };
+static const fix16_t AircraftSpeedsTable[] =
+{
+ [AIRCRAFT_SPEED_IDLE] = 0,
+ [AIRCRAFT_SPEED_GROUND] = 0x9999,
+ [AIRCRAFT_SPEED_TAKEOFF] = 0x20000,
+ [AIRCRAFT_SPEED_FINAL] = 0x10000,
+ [AIRCRAFT_SPEED_FINAL_Z] = 0x3000
+};
/* *************************************
* Local prototypes
@@ -115,12 +112,21 @@ void AircraftInit(void) if (initialised == false)
{
+ static const char* const GameFileList[] =
+ {
+ "DATA\\SPRITES\\UDNARROW.TIM",
+ "DATA\\SPRITES\\LFRARROW.TIM"
+ };
+
+ static void* const GameFileDest[] =
+ {
+ &UpDownArrowSpr,
+ &LeftRightArrowSpr
+ };
+
initialised = true;
- LoadMenu( GameFileList,
- GameFileDest,
- sizeof (GameFileList) / sizeof (GameFileList[0]),
- sizeof (GameFileDest) / sizeof (GameFileDest[0]) );
+ LOAD_FILES(GameFileList, GameFileDest);
}
}
@@ -157,7 +163,7 @@ bool AircraftAddNew( TYPE_FLIGHT_DATA* const ptrFlightData, 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 <<= TILE_SIZE_BIT_SHIFT - 2;
ptrAircraft->IsoPos.z = fix16_from_int(ptrAircraft->IsoPos.z);
break;
@@ -170,7 +176,7 @@ bool AircraftAddNew( TYPE_FLIGHT_DATA* const ptrFlightData, ptrAircraft->IsoPos.y = 0;
ptrAircraft->IsoPos.z = targets[0] / level_columns;
- ptrAircraft->IsoPos.z <<= TILE_SIZE_BIT_SHIFT - 1;
+ ptrAircraft->IsoPos.z <<= TILE_SIZE_BIT_SHIFT - 2;
ptrAircraft->IsoPos.z = fix16_from_int(ptrAircraft->IsoPos.z);
break;
|