etc
/
SuperMarioOdysseyOnline
mirror of https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
0
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix switching modes between scenes

This commit is contained in:
Sanae 2022-08-10 15:10:28 -06:00
parent 34691affb0
commit d18276d255
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/server/gamemode/GameModeManager.cpp
View File

@ -58,8 +58,9 @@ void GameModeManager::update() {
void GameModeManager::initScene(const GameModeInitInfo& info) {
sead::ScopedCurrentHeapSetter heapSetter(mHeap);
if (mCurModeBase != nullptr) {
if (mCurModeBase != nullptr && mWasSetMode) {
delete mCurModeBase;
mCurModeBase = nullptr;
}
if (mLastInitInfo != nullptr) {
@ -68,19 +69,17 @@ void GameModeManager::initScene(const GameModeInitInfo& info) {
if (mCurMode == GameMode::NONE) {
mCurModeBase = nullptr;
delete mModeInfo;
mModeInfo = nullptr;
return;
}
mLastInitInfo = new GameModeInitInfo(info);
if (!mCurModeBase && mWasSetMode) {
if (mWasSetMode) {
GameModeFactory factory("GameModeFactory");
const char* name = factory.getModeString(mCurMode);
mCurModeBase = factory.getCreator(name)(name);
if (mLastInitInfo) { // check if there's a previously used init info
mCurModeBase->init(*mLastInitInfo);
}
mWasSetMode = false;
}