actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash when reloading songs with players joined

Browse Source 
This allows to call ScreenReloadSongs from SSM.
This commit is contained in:
Martin Natano
2022-03-18 21:55:07 +01:00
committed by teejusb
parent c99477f046
commit 024f3ac96a
1 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongManager.cpp
+61
View File
@@ -12,6 +12,7 @@
#include "GameManager.h"
#include "GameState.h"
#include "LocalizedString.h"
#include "MemoryCardManager.h"
#include "MsdFile.h"
#include "NoteSkinManager.h"
#include "NotesLoaderDWI.h"
@@ -37,6 +38,8 @@
#include "UnlockManager.h"
#include "SpecialFiles.h"
#include <tuple>
SongManager* SONGMAN = nullptr; // global and accessible from anywhere in our program
/** @brief The file that contains various random attacks. */
@@ -121,6 +124,39 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
// save scores before unloading songs, or the scores will be lost
PROFILEMAN->SaveMachineProfile();
GAMESTATE->SavePlayerProfiles();
std::vector<std::tuple<PlayerNumber, RString, bool>> rejoinPlayers;
FOREACH_HumanPlayer(pn)
{
if (GAMESTATE->m_bSideIsJoined[pn])
{
if (PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn))
{
rejoinPlayers.push_back(std::make_tuple(pn, RString(""), true));
}
else if (PROFILEMAN->IsPersistentProfile(pn))
{
int numLocalProfiles = PROFILEMAN->GetNumLocalProfiles();
for (int i = 0; i < numLocalProfiles; i++)
{
Profile *profile = PROFILEMAN->GetLocalProfileFromIndex(i);
if (profile->m_sGuid == PROFILEMAN->GetProfile(pn)->m_sGuid)
{
RString profileID = PROFILEMAN->GetLocalProfileIDFromIndex(i);
rejoinPlayers.push_back(std::make_tuple(pn, profileID, false));
break;
}
}
}
else
{
rejoinPlayers.push_back(std::make_tuple(pn, RString(""), false));
}
GAMESTATE->UnjoinPlayer(pn);
PROFILEMAN->UnloadProfile(pn);
}
}
if( ld )
ld->SetText( UNLOADING_COURSES );
@@ -140,6 +176,31 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
// reload scores and unlocks afterward
PROFILEMAN->LoadMachineProfile();
MEMCARDMAN->WaitForCheckingToComplete();
for (auto& it : rejoinPlayers)
{
PlayerNumber pn;
RString profileID;
bool isMemoryCard;
std::tie(pn, profileID, isMemoryCard) = it;
GAMESTATE->JoinPlayer(pn);
if (isMemoryCard)
{
bool success = MEMCARDMAN->MountCard(pn);
if (success)
{
PROFILEMAN->LoadProfileFromMemoryCard(pn, true);
MEMCARDMAN->UnmountCard(pn);
}
}
else
{
PROFILEMAN->m_sDefaultLocalProfileID[pn].Set(profileID);
PROFILEMAN->LoadLocalProfileFromMachine(pn);
}
GAMESTATE->LoadCurrentSettingsFromProfile(pn);
}
UNLOCKMAN->Reload();
if( !bAllowFastLoad )