diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-23 01:32:26 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-23 01:32:26 +0200 |
| commit | e6d41c59ffa15dee7f8bc9d7ea0e12ac682da595 (patch) | |
| tree | 19a1b57479a66efe6f74c2eedfd4795554fa75b7 /Source/Menu.c | |
| parent | 286d13d71d017003df4cb44fc4ef4822d9e39c03 (diff) | |
| download | airport-e6d41c59ffa15dee7f8bc9d7ea0e12ac682da595.tar.gz | |
Bugfix: ptrPlayer->SelectedAircraft was being substracted when == 0 and caused a game crash. Bugfix: aircraft did not stop when DIR_SOUTH.
Diffstat (limited to 'Source/Menu.c')
| -rw-r--r-- | Source/Menu.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Source/Menu.c b/Source/Menu.c index fa1c701..58a6260 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -131,20 +131,20 @@ static TYPE_CHEAT StackCheckCheat; static TYPE_CHEAT DevMenuCheat; static TYPE_CHEAT SerialCheat; -static char* MainMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\MAINMENU.TIM;1" , - "cdrom:\\DATA\\SOUNDS\\BELL.VAG;1" , - "cdrom:\\DATA\\SOUNDS\\ACCEPT.VAG;1" , - "cdrom:\\DATA\\SPRITES\\BUTTONS.TIM;1" , - "cdrom:\\DATA\\SPRITES\\MENUSTAR.TIM;1" , +static const char* MainMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\MAINMENU.TIM;1" , + "cdrom:\\DATA\\SOUNDS\\BELL.VAG;1" , + "cdrom:\\DATA\\SOUNDS\\ACCEPT.VAG;1" , + "cdrom:\\DATA\\SPRITES\\BUTTONS.TIM;1" , + "cdrom:\\DATA\\SPRITES\\MENUSTAR.TIM;1" , #ifndef NO_INTRO - "cdrom:\\DATA\\SPRITES\\PSXDISK.TIM;1" , - "cdrom:\\DATA\\FONTS\\INTROFNT.TIM;1" , - "cdrom:\\DATA\\SPRITES\\GPL.TIM;1" , - "cdrom:\\DATA\\SPRITES\\OPENSRC.TIM;1" , - "cdrom:\\DATA\\SOUNDS\\TRAYCL.VAG;1" , - "cdrom:\\DATA\\SOUNDS\\SPINDISK.VAG;1" + "cdrom:\\DATA\\SPRITES\\PSXDISK.TIM;1" , + "cdrom:\\DATA\\FONTS\\INTROFNT.TIM;1" , + "cdrom:\\DATA\\SPRITES\\GPL.TIM;1" , + "cdrom:\\DATA\\SPRITES\\OPENSRC.TIM;1" , + "cdrom:\\DATA\\SOUNDS\\TRAYCL.VAG;1" , + "cdrom:\\DATA\\SOUNDS\\SPINDISK.VAG;1" #endif // NO_INTRO - }; + }; static void* MainMenuDest[] = { (GsSprite*)&MenuSpr , (SsVag*)&BellSnd , @@ -207,7 +207,8 @@ void TwoPlayerMenu(void) void MainMenuInit(void) { - LoadMenu( MainMenuFiles,MainMenuDest, + LoadMenu( MainMenuFiles, + MainMenuDest, sizeof(MainMenuFiles) / sizeof(char*) , sizeof(MainMenuDest) / sizeof(void*) ); @@ -550,7 +551,7 @@ void MainMenuDrawButton(TYPE_MMBtn * btn) default: break; } - + MenuSpr.u += btn->offset_u; MenuSpr.v += btn->offset_v; MenuSpr.y -= MainMenuBtnAni[btn->timer]; |