AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-13 14:05:52 +00:00
Code Issues Projects Releases Wiki Activity

CMain::StreamNewGameState merge fixes

Browse Source
This commit is contained in:
Jack Andersen 2016-12-29 20:43:29 -10:00
parent 735183d51a
commit 2699d96989
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/MP1.cpp
View File

@ -131,10 +131,10 @@ void CMain::LoadAudio()
void CMain::StreamNewGameState(CBitStreamReader& r, u32 idx) void CMain::StreamNewGameState(CBitStreamReader& r, u32 idx)
{ {
bool fusionBackup = g_GameState->SystemOptions().GetPlayerHasFusion(); bool fusionBackup = g_GameState->SystemOptions().GetPlayerHasFusion();
x128_globalObjects.x134_gameState = CGameState(r, idx); x128_globalObjects.x134_gameState = std::make_unique<CGameState>(r, idx);
g_GameState = &x128_globalObjects.x134_gameState; g_GameState = x128_globalObjects.x134_gameState.get();
g_GameState->SystemOptions().SetPlayerHasFusion(fusionBackup); g_GameState->SystemOptions().SetPlayerHasFusion(fusionBackup);
g_GameState->GetPlayerState()->SetFusion(fusionBackup); g_GameState->GetPlayerState()->SetIsFusionEnabled(fusionBackup);
g_GameState->HintOptions().SetNextHintTime(); g_GameState->HintOptions().SetNextHintTime();
} }