diff --git a/src/rct2.c b/src/rct2.c index e900020c60..d52781fd47 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -281,12 +281,12 @@ int check_file_path(int pathId) case PATH_ID_CUSTOM1: if (file != INVALID_HANDLE_VALUE) - RCT2_GLOBAL(0x009AF164, unsigned int) = SetFilePointer(file, 0, 0, FILE_END); // Store file size in music_custom1_size @ 0x009AF164 + ride_music_info_list[36]->length = SetFilePointer(file, 0, 0, FILE_END); // Store file size in music_custom1_size @ 0x009AF164 break; case PATH_ID_CUSTOM2: if (file != INVALID_HANDLE_VALUE) - RCT2_GLOBAL(0x009AF16E, unsigned int) = SetFilePointer(file, 0, 0, FILE_END); // Store file size in music_custom2_size @ 0x009AF16E + ride_music_info_list[37]->length = SetFilePointer(file, 0, 0, FILE_END); // Store file size in music_custom2_size @ 0x009AF16E break; } diff --git a/src/ride/ride.c b/src/ride/ride.c index bb41163346..f70065460e 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -2849,8 +2849,8 @@ rct_ride_music_info* ride_music_info_list[] = { INIT_MUSIC_INFO(PATH_ID_CSS36, 2756, 8953764, 1), INIT_MUSIC_INFO(PATH_ID_CSS37, 2756, 13303852, 1), INIT_MUSIC_INFO(PATH_ID_CSS38, 2756, 10093888, 1), - INIT_MUSIC_INFO(PATH_ID_CUSTOM1, 2756, 16620, 1), - INIT_MUSIC_INFO(PATH_ID_CUSTOM2, 2756, 13055722, 1), + INIT_MUSIC_INFO(PATH_ID_CUSTOM1, 2756, 0, 1), + INIT_MUSIC_INFO(PATH_ID_CUSTOM2, 2756, 0, 1), INIT_MUSIC_INFO(PATH_ID_CSS39, 2756, 7531564, 1), INIT_MUSIC_INFO(PATH_ID_CSS40, 1378, 5291306, 1), INIT_MUSIC_INFO(PATH_ID_CSS41, 2756, 27860700, 1), diff --git a/src/windows/ride.c b/src/windows/ride.c index 989d1092f2..7ad719444f 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -4343,9 +4343,9 @@ static void window_ride_music_mousedown(int widgetIndex, rct_window *w, rct_widg for (i = 0; i < countof(MusicStyleOrder); i++) window_ride_current_music_style_order[numItems++] = MusicStyleOrder[i]; - if (RCT2_GLOBAL(0x009AF164, uint32) != 0) + if (ride_music_info_list[36]->length != 0) window_ride_current_music_style_order[numItems++] = MUSIC_STYLE_CUSTOM_MUSIC_1; - if (RCT2_GLOBAL(0x009AF16E, uint32) != 0) + if (ride_music_info_list[37]->length != 0) window_ride_current_music_style_order[numItems++] = MUSIC_STYLE_CUSTOM_MUSIC_2; }