From 6eb580f50875f338870c67de1b8a87ab1b116969 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Fri, 19 Feb 2016 20:08:22 -0700 Subject: [PATCH 1/2] fix ride music related source of desync --- src/ride/ride.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index f62719dd24..a92f65dd8a 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -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; } From 9b3d36eb95f1d868ca8054f028662e78a1f82b94 Mon Sep 17 00:00:00 2001 From: zsilencer Date: Fri, 26 Feb 2016 23:00:58 -0700 Subject: [PATCH 2/2] Fix #2988: utf8 strings not working in multiplayer --- src/game.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/game.c b/src/game.c index 7c0e632910..a05ded09fe 100644 --- a/src/game.c +++ b/src/game.c @@ -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; }