Merge branch 'master' of https://github.com/XaviDCR92/Airport
This commit is contained in:
commit
f06d582d63
BIN
Bin/AIRPORT.bin
BIN
Bin/AIRPORT.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -914,35 +914,23 @@ void GamePlayerHandler(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData)
|
|||
|
||||
// Recalculate ptrPlayer->SelectedAircraft. In case new aircraft appear, we may be pointing
|
||||
// to a incorrect instance.
|
||||
dprintf("GameActiveAircraftList\n");
|
||||
GameActiveAircraftList(ptrPlayer, ptrFlightData);
|
||||
|
||||
dprintf("GameAircraftCollisionFlag\n");
|
||||
if (GameAircraftCollisionFlag == true)
|
||||
{
|
||||
TYPE_ISOMETRIC_POS IsoPos = AircraftGetIsoPos(GameAircraftCollisionIdx);
|
||||
CameraMoveToIsoPos(ptrPlayer, IsoPos);
|
||||
}
|
||||
|
||||
dprintf("GameStateUnboarding\n");
|
||||
GameStateUnboarding(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameStateLockTarget\n");
|
||||
GameStateLockTarget(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameStateSelectRunway\n");
|
||||
GameStateSelectRunway(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameStateSelectTaxiwayRunway\n");
|
||||
GameStateSelectTaxiwayRunway(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameStateSelectTaxiwayParking\n");
|
||||
GameStateSelectTaxiwayParking(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameStateShowAircraft\n");
|
||||
GameStateShowAircraft(ptrPlayer, ptrFlightData);
|
||||
dprintf("CameraHandler\n");
|
||||
CameraHandler(ptrPlayer);
|
||||
dprintf("GameGuiActiveAircraftPage\n");
|
||||
GameGuiActiveAircraftPage(ptrPlayer, ptrFlightData);
|
||||
dprintf("GameSelectAircraftFromList\n");
|
||||
GameSelectAircraftFromList(ptrPlayer, ptrFlightData);
|
||||
dprintf("Finished GameHandler\n");
|
||||
}
|
||||
|
||||
/* *******************************************************************
|
||||
|
@ -3357,7 +3345,6 @@ void GameStateUnboarding(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFlightData
|
|||
// Flight has finished. Remove aircraft and set finished flag
|
||||
ptrPlayer->Unboarding = false;
|
||||
GameRemoveFlight(ptrPlayer->FlightDataSelectedAircraft, true);
|
||||
dprintf("YO\n");
|
||||
}
|
||||
|
||||
ptrPlayer->UnboardingSequenceIdx = 0;
|
||||
|
@ -3483,7 +3470,7 @@ void GameCreateTakeoffWaypoints(TYPE_PLAYER* ptrPlayer, TYPE_FLIGHT_DATA* ptrFli
|
|||
(GameLevelBuffer[currentTile] != TILE_RWY_START_2);
|
||||
currentTile -= rwyStep )
|
||||
{
|
||||
|
||||
// Calculate new currentTile value until conditions are invalid.
|
||||
}
|
||||
|
||||
for (i = 0; i < GAME_MAX_RUNWAYS; i++)
|
||||
|
|
|
@ -172,9 +172,6 @@ $(OBJ_LEVELS_DIR)/%.PLT: $(SRC_LEVELS_DIR)/%.PLT
|
|||
|
||||
music: clean_music music_objects
|
||||
|
||||
clean_music:
|
||||
rm -f ../Music/*.bin
|
||||
|
||||
%.bin: %.mp3
|
||||
rm -f ../Bin/$@1
|
||||
$(FFMPEG) -i $< $(FFMPEG_FLAGS) $@
|
||||
|
@ -183,4 +180,4 @@ clean_music:
|
|||
# ----------------------------------------
|
||||
# Phony targets
|
||||
# ----------------------------------------
|
||||
.PHONY: sounds clean music
|
||||
.PHONY: clean music
|
||||
|
|
|
@ -207,6 +207,12 @@ void TwoPlayerMenu(void)
|
|||
|
||||
void MainMenuInit(void)
|
||||
{
|
||||
enum
|
||||
{
|
||||
MENU_STAR_X = 32,
|
||||
MENU_STAR_Y = Y_SCREEN_RESOLUTION - 32,
|
||||
};
|
||||
|
||||
LoadMenu( MainMenuFiles,
|
||||
MainMenuDest,
|
||||
sizeof(MainMenuFiles) / sizeof(char*) ,
|
||||
|
@ -240,6 +246,10 @@ void MainMenuInit(void)
|
|||
|
||||
MainMenuMinimumBtn = PLAY_BUTTON_INDEX;
|
||||
|
||||
MenuStarSpr.x = MENU_STAR_X;
|
||||
MenuStarSpr.y = MENU_STAR_Y;
|
||||
MenuStarSpr.rotate = 0;
|
||||
|
||||
MenuCheatInit();
|
||||
|
||||
LoadMenuEnd();
|
||||
|
@ -324,6 +334,10 @@ void MainMenu(void)
|
|||
|
||||
GsSortCls(MAIN_MENU_BG_R, MAIN_MENU_BG_G, MAIN_MENU_BG_B);
|
||||
|
||||
MenuStarSpr.rotate += ROTATE_ONE;
|
||||
|
||||
GfxSortSprite(&MenuStarSpr);
|
||||
|
||||
switch(menuLevel)
|
||||
{
|
||||
case PLAY_OPTIONS_LEVEL:
|
||||
|
@ -332,8 +346,6 @@ void MainMenu(void)
|
|||
break;
|
||||
|
||||
case ONE_TWO_PLAYERS_LEVEL:
|
||||
|
||||
GsSortCls(0,0,40);
|
||||
MainMenuDrawButton(&MainMenuBtn[ONE_PLAYER_BUTTON_INDEX]);
|
||||
MainMenuDrawButton(&MainMenuBtn[TWO_PLAYER_BUTTON_INDEX]);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue
Block a user