From 2699d96989c0ca88cc143a1e1dac8c16e5a81451 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 29 Dec 2016 20:43:29 -1000 Subject: [PATCH] CMain::StreamNewGameState merge fixes --- Runtime/MP1/MP1.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp index 3b38f6165..5a2f1d7b4 100644 --- a/Runtime/MP1/MP1.cpp +++ b/Runtime/MP1/MP1.cpp @@ -131,10 +131,10 @@ void CMain::LoadAudio() void CMain::StreamNewGameState(CBitStreamReader& r, u32 idx) { bool fusionBackup = g_GameState->SystemOptions().GetPlayerHasFusion(); - x128_globalObjects.x134_gameState = CGameState(r, idx); - g_GameState = &x128_globalObjects.x134_gameState; + x128_globalObjects.x134_gameState = std::make_unique(r, idx); + g_GameState = x128_globalObjects.x134_gameState.get(); g_GameState->SystemOptions().SetPlayerHasFusion(fusionBackup); - g_GameState->GetPlayerState()->SetFusion(fusionBackup); + g_GameState->GetPlayerState()->SetIsFusionEnabled(fusionBackup); g_GameState->HintOptions().SetNextHintTime(); }