diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-26 21:52:39 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-26 21:52:39 +0200 |
| commit | f6f5a1ab111254522efcec0bb6e485d4f76429d7 (patch) | |
| tree | fb61b2c2cb1be5a2d90cebd3a42d9d6aae50904d | |
| parent | e6d41c59ffa15dee7f8bc9d7ea0e12ac682da595 (diff) | |
* Removed now unneeded dprintf calls on Game.c.
* Imported MenuStar sprite into Menu.c.
* Minor changes on Makefile (clean_music target removed).
| -rw-r--r-- | Bin/AIRPORT.bin | bin | 1655808 -> 1655808 bytes | |||
| -rwxr-xr-x | Source/Exe/AIRPORT.elf | bin | 326864 -> 326904 bytes | |||
| -rw-r--r-- | Source/Exe/AIRPORT.iso | bin | 1441792 -> 1441792 bytes | |||
| -rw-r--r-- | Source/Game.c | 15 | ||||
| -rw-r--r-- | Source/Makefile | 5 | ||||
| -rw-r--r-- | Source/Menu.c | 16 |
6 files changed, 16 insertions, 20 deletions
diff --git a/Bin/AIRPORT.bin b/Bin/AIRPORT.bin Binary files differindex d2f83ab..d432dcd 100644 --- a/Bin/AIRPORT.bin +++ b/Bin/AIRPORT.bin diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf Binary files differindex d0a5f1e..507f737 100755 --- a/Source/Exe/AIRPORT.elf +++ b/Source/Exe/AIRPORT.elf diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso Binary files differindex d8c4130..51ad22b 100644 --- a/Source/Exe/AIRPORT.iso +++ b/Source/Exe/AIRPORT.iso diff --git a/Source/Game.c b/Source/Game.c index 52056ff..8b23031 100644 --- a/Source/Game.c +++ b/Source/Game.c @@ -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++) diff --git a/Source/Makefile b/Source/Makefile index 16b30b0..c876f60 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -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 diff --git a/Source/Menu.c b/Source/Menu.c index 58a6260..bd12ac2 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -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; |
