mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1193 from zsilencer/bugfix 

#1192
This commit is contained in:
Ted John 2015-06-01 21:36:54 +01:00
parent a63b7906c8 603233a583
commit 954db85e8c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rct2.c
View File

@ -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;
}

4
src/ride/ride.c
View File

@ -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),

4
src/windows/ride.c
View File

@ -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;
}