From be36d09ae70587f2ccb73906e895914421f336ff Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Sun, 11 Mar 2018 14:20:36 +0100 Subject: * Game.c: removed obsolete comments. * GameGui.c: status shown on aircraft list is now summarized on a table. --- Source/Game.c | 15 +-------- Source/GameGui.c | 85 +++++++++++++------------------------------------ Source/GameStructures.h | 3 +- 3 files changed, 26 insertions(+), 77 deletions(-) (limited to 'Source') diff --git a/Source/Game.c b/Source/Game.c index edf2c78..653e911 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -1266,13 +1266,13 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) uint16_t tileNr; uint8_t rows = 0; uint8_t columns = 0; - uint8_t k; for (tileNr = 0; tileNr < GameLevelSize; tileNr++) { // Building data is stored in GameLevelBuffer MSB. LSB is dedicated to tile data. uint8_t CurrentBuilding = (uint8_t)(GameLevelBuffer[tileNr] >> 8); uint8_t j; + uint8_t k; uint8_t AircraftRenderOrder[GAME_MAX_AIRCRAFT_PER_TILE]; short Aircraft_Y_Data[GAME_MAX_AIRCRAFT_PER_TILE]; @@ -1284,8 +1284,6 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) Aircraft_Y_Data[j] = 0x7FFF; } - //memset(Aircraft_Y_Data, 0x7F, GAME_MAX_AIRCRAFT_PER_TILE * sizeof (short)); - for (j = 0; j < GAME_MAX_AIRCRAFT_PER_TILE; j++) { uint8_t AircraftIdx = GameAircraftTilemap[tileNr][j]; @@ -1319,12 +1317,6 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) break; } } - - /*for (k = 0; k < GAME_MAX_AIRCRAFT_PER_TILE; k++) - { - Serial_printf("Aircraft_Y_Data[%d] = %d\n", k, Aircraft_Y_Data[k]); - Serial_printf("AircraftRenderOrder[%d] = %d\n", k, AircraftRenderOrder[k]); - }*/ } if (CurrentBuilding == BUILDING_NONE) @@ -1348,15 +1340,10 @@ void GameRenderBuildingAircraft(TYPE_PLAYER* ptrPlayer) .z = z_bldg_offset }; // Isometric -> Cartesian conversion - //buildingIsoPos.x = (columns << (TILE_SIZE_BIT_SHIFT)) + x_bldg_offset; - //buildingIsoPos.y = (rows << (TILE_SIZE_BIT_SHIFT)) + y_bldg_offset; - //buildingIsoPos.z = z_bldg_offset; - TYPE_CARTESIAN_POS buildingCartPos = GfxIsometricToCartesian(&buildingIsoPos); bool buildingDrawn = false; // Define new coordinates for building. - GameBuildingSpr.x = buildingCartPos.x - GameBuildingData[CurrentBuilding].orig_x; GameBuildingSpr.y = buildingCartPos.y - GameBuildingData[CurrentBuilding].orig_y; diff --git a/Source/GameGui.c b/Source/GameGui.c index f15c9c0..3733de5 100644 --- a/Source/GameGui.c +++ b/Source/GameGui.c @@ -871,11 +871,11 @@ void GameGuiShowPassengersLeft(TYPE_PLAYER* ptrPlayer) { if (GameTwoPlayersActive() != false) { - FontPrintText(&SmallFont, 48, Y_SCREEN_RESOLUTION - 64, "%d left", ptrPlayer->PassengersLeftSelectedAircraft); + FontPrintText(&SmallFont, 48, Y_SCREEN_RESOLUTION - 64, "%d passengers left", ptrPlayer->PassengersLeftSelectedAircraft); } else { - FontPrintText(&SmallFont, 128, Y_SCREEN_RESOLUTION - 64, "%d left", ptrPlayer->PassengersLeftSelectedAircraft); + FontPrintText(&SmallFont, 128, Y_SCREEN_RESOLUTION - 64, "%d pax. left", ptrPlayer->PassengersLeftSelectedAircraft); } } } @@ -936,6 +936,18 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight for (i = init_flight ; i < ptrPlayer->ActiveAircraft ; i++) { + const char* const strAircraftArray[MAX_STATES] = { [STATE_APPROACH] = "Approach", + [STATE_READY_FOR_TAKEOFF] = "Takeoff", + [STATE_LANDED] = "Landed", + [STATE_PARKED] = "Parked", + [STATE_UNBOARDING] = "Unboard", + [STATE_HOLDING_RWY] = "Holding", + [STATE_USER_STOPPED] = "Stopped", + [STATE_AUTO_STOPPED] = "Stopped" }; + + FL_STATE aircraftState; + const char* strState; + j = i - init_flight; if (j >= GAME_GUI_AIRCRAFT_DATA_MAX_PAGE) @@ -971,71 +983,20 @@ void GameGuiShowAircraftData(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlight FontSetFlags(&SmallFont, FONT_2HZ_FLASH); - switch(ptrFlightData->State[ptrPlayer->ActiveAircraftList[i]]) - { - case STATE_APPROACH: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Approach" ); - break; + aircraftState = ptrFlightData->State[ptrPlayer->ActiveAircraftList[i]]; - case STATE_READY_FOR_TAKEOFF: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Takeoff" ); - break; + strState = strAircraftArray[aircraftState]; - case STATE_LANDED: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Landed" ); - break; - - case STATE_PARKED: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Parked" ); - break; - - case STATE_UNBOARDING: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Unboard" ); - break; - - case STATE_HOLDING_RWY: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Holding" ); - break; - - case STATE_USER_STOPPED: - // Fall through - case STATE_AUTO_STOPPED: - FontPrintText( &SmallFont, - AircraftDataDirection_X + AircraftDataState_X_Offset, - AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "Stopped" ); - break; - - default: - break; - } + if (strState != NULL) + { + FontPrintText( &SmallFont, + AircraftDataDirection_X + AircraftDataState_X_Offset, + AircraftDataDirection_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), + (char*)strState ); + } FontSetFlags(&SmallFont, FONT_NOFLAGS); - /*FontPrintText( &SmallFont, - AircraftDataPassengers_X, - AircraftDataPassengers_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), - "%d pax.", - ptrFlightData->Passengers[ptrPlayer->ActiveAircraftList[i]] );*/ - FontPrintText( &SmallFont, AircraftDataRemainingTime_X, AircraftDataRemainingTime_Y + (AIRCRAFT_DATA_FLIGHT_GSGPOLY4_H * j), diff --git a/Source/GameStructures.h b/Source/GameStructures.h index 51ee103..557c73f 100644 --- a/Source/GameStructures.h +++ b/Source/GameStructures.h @@ -49,7 +49,8 @@ typedef enum t_flstate STATE_FINAL, STATE_USER_STOPPED, STATE_AUTO_STOPPED, - STATE_LANDED + STATE_LANDED, + MAX_STATES }FL_STATE; typedef enum t_LevelDifficulty -- cgit v1.2.3