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/LoadMenu.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/LoadMenu.c')
| -rw-r--r-- | Source/LoadMenu.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/LoadMenu.c b/Source/LoadMenu.c index 60b00a7..52bd093 100644 --- a/Source/LoadMenu.c +++ b/Source/LoadMenu.c @@ -78,7 +78,7 @@ static void LoadMenuInit(void); static void ISR_LoadMenuVBlank(void); static bool LoadMenuISRHasEnded(void); static bool LoadMenuISRHasStarted(void); -static void LoadMenuLoadFileList( char* fileList[], void* dest[], +static void LoadMenuLoadFileList( const char* fileList[], void* dest[], uint8_t szFileList, uint8_t szDestList); /* ************************************* @@ -91,9 +91,9 @@ static GsSprite LoadMenuTitleSpr; static GsLine LoadMenuBarLines[LOADING_BAR_N_LINES]; static GsRectangle LoadMenuBarRect; -static char* LoadMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\PLANE.TIM;1", - "cdrom:\\DATA\\SPRITES\\LOADING.TIM;1", - "cdrom:\\DATA\\FONTS\\FONT_2.FNT;1" }; +static const char* LoadMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\PLANE.TIM;1", + "cdrom:\\DATA\\SPRITES\\LOADING.TIM;1", + "cdrom:\\DATA\\FONTS\\FONT_2.FNT;1" }; static void* LoadMenuDest[] = { (GsSprite*)&LoadMenuPlaneSpr, (GsSprite*)&LoadMenuTitleSpr, @@ -439,7 +439,7 @@ bool LoadMenuISRHasStarted(void) return isr_started; } -void LoadMenu( char* fileList[], +void LoadMenu( const char* fileList[], void* dest[], uint8_t szFileList , uint8_t szDestList) { @@ -451,11 +451,10 @@ void LoadMenu( char* fileList[], while (LoadMenuISRHasStarted() == false); } - LoadMenuLoadFileList(fileList,dest,szFileList,szDestList); - + LoadMenuLoadFileList(fileList, dest, szFileList, szDestList); } -void LoadMenuLoadFileList( char* fileList[], void* dest[], +void LoadMenuLoadFileList( const char* fileList[], void* dest[], uint8_t szFileList, uint8_t szDestList) { char aux_file_name[100]; @@ -472,7 +471,7 @@ void LoadMenuLoadFileList( char* fileList[], void* dest[], for (fileLoadedCount = 0; fileLoadedCount < szFileList ; fileLoadedCount++) { - strCurrentFile = fileList[fileLoadedCount]; + strCurrentFile = (char*)fileList[fileLoadedCount]; if (strCurrentFile == NULL) { |