Merge pull request #3024 from zsilencer/bugfixes

Bugfixes
This commit is contained in:
Ted John 2016-02-27 11:32:47 +00:00
commit b19d752b36
2 changed files with 2 additions and 1 deletions

View File

@ -878,6 +878,7 @@ int game_load_network(SDL_RWops* rw)
map_update_tile_pointers();
reset_0x69EBE4();
openrct2_reset_object_tween_locations();
game_convert_strings_to_utf8();
return 1;
}

View File

@ -2667,7 +2667,7 @@ static void ride_music_update(int rideIndex)
if (ride->music_tune_id == 255) {
uint8 *musicStyleTunes = ride_music_style_tuneids[ride->music];
uint8 numTunes = *musicStyleTunes++;
ride->music_tune_id = musicStyleTunes[scenario_rand() % numTunes];
ride->music_tune_id = musicStyleTunes[util_rand() % numTunes];
ride->music_position = 0;
return;
}