diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-08-19 16:51:00 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-08-19 16:51:00 +0200 |
| commit | e778deb2c0c7fa2ce2d605dde7a5fe86a686e078 (patch) | |
| tree | 90684cd779d13b5e490a8289e8770ba999da00e5 /Source/GameGui.c | |
| parent | b1aad213d450beae9920e30d6534680474f8df6f (diff) | |
| download | airport-e778deb2c0c7fa2ce2d605dde7a5fe86a686e078.tar.gz | |
* (Bugfix): ptrPlayer->SelectedAircraft was not being updated correctly when new aircraft appeared.
* (Bugfix): PltParser was casting remaining time to uint8_t instead of uint16_t.
* Reduced file buffer size to original value.
* GfxDrawButton(): L1/R1/L2/R2 text is now printed on top of Lx/Rx button.
* Other minor changes.
Diffstat (limited to 'Source/GameGui.c')
| -rw-r--r-- | Source/GameGui.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/GameGui.c b/Source/GameGui.c index c049ebd..0a0ea72 100644 --- a/Source/GameGui.c +++ b/Source/GameGui.c @@ -82,14 +82,6 @@ enum enum
{
- AIRCRAFT_STOP_X = 192,
- AIRCRAFT_STOP_TEXT_X = AIRCRAFT_STOP_X + 16,
- AIRCRAFT_STOP_Y = AIRCRAFT_LOCK_TARGET_Y,
- AIRCRAFT_STOP_TEXT_Y = AIRCRAFT_STOP_Y + 4
-};
-
-enum
-{
AIRCRAFT_DATA_FLIGHT_GSGPOLY4_R0 = NORMAL_LUMINANCE,
AIRCRAFT_DATA_FLIGHT_GSGPOLY4_R1 = AIRCRAFT_DATA_FLIGHT_GSGPOLY4_R0,
AIRCRAFT_DATA_FLIGHT_GSGPOLY4_R2 = 0,
@@ -412,6 +404,14 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData GAME_GUI_REMAINING_AIRCRAFT_X_2PLAYER = AIRCRAFT_DATA_GSGPOLY4_X0_2PLAYER + 16,
GAME_GUI_REMAINING_AIRCRAFT_Y_2PLAYER = AIRCRAFT_DATA_GSGPOLY4_Y2_2PLAYER - 16
};
+
+ enum
+ {
+ AIRCRAFT_STOP_X = 128,
+ AIRCRAFT_STOP_TEXT_X = AIRCRAFT_STOP_X + 32,
+ AIRCRAFT_STOP_Y = AIRCRAFT_LOCK_TARGET_Y,
+ AIRCRAFT_STOP_TEXT_Y = AIRCRAFT_STOP_Y + 4
+ };
if(ptrPlayer->ShowAircraftData == true)
{
@@ -543,7 +543,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData GsSortGPoly4(&SelectedAircraftGPoly4);
- PageUpDownSpr.attribute |= GFX_1HZ_FLASH;
+ PageUpDownSpr.attribute |= GFX_2HZ_FLASH;
if(ptrPlayer->ActiveAircraft > (GAME_GUI_AIRCRAFT_DATA_MAX_PAGE * (ptrPlayer->FlightDataPage + 1) ) )
{
@@ -609,6 +609,7 @@ void GameGuiAircraftList(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData }
else if(ptrFlightData->State[ptrPlayer->FlightDataSelectedAircraft] == STATE_TAXIING)
{
+ GfxDrawButton(AIRCRAFT_STOP_X, AIRCRAFT_STOP_Y, PAD_L1);
FontPrintText(&SmallFont, AIRCRAFT_STOP_TEXT_X, AIRCRAFT_STOP_TEXT_Y, "Stop immediately");
}
}
|