From e778deb2c0c7fa2ce2d605dde7a5fe86a686e078 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Sat, 19 Aug 2017 16:51:00 +0200 Subject: * (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. --- Source/GameGui.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Source/GameGui.c') diff --git a/Source/GameGui.c b/Source/GameGui.c index c049ebd..0a0ea72 100644 --- a/Source/GameGui.c +++ b/Source/GameGui.c @@ -80,14 +80,6 @@ enum AIRCRAFT_LOCK_TARGET_TEXT_Y = AIRCRAFT_LOCK_TARGET_Y + 4, }; -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, @@ -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"); } } -- cgit v1.2.3