mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-03-06 14:00:39 +00:00
game mode filterfix
GameMode::findGameModes now only returns the *active* ones. SubScene::load() checks against either that, or if it's selected
This commit is contained in:
parent
9f3785d893
commit
18750047fb
2 changed files with 3 additions and 2 deletions
|
|
@ -348,7 +348,7 @@ void SubScene::load()
|
|||
return;
|
||||
|
||||
GameMode::findGameModes(mGameModesNames, &mGameModesList);
|
||||
if ((String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition())
|
||||
if (!isSelected() && (String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition())
|
||||
{
|
||||
mLoaded = false;
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -101,7 +101,8 @@ void GameMode::findGameModes(const char* gameModeList, Vector<GameMode*> *outGam
|
|||
GameMode* gm;
|
||||
if (Sim::findObject(gameModeNames[i].c_str(), gm))
|
||||
{
|
||||
outGameModes->push_back(gm);
|
||||
if (gm->isActive() || gm->isAlwaysActive())
|
||||
outGameModes->push_back(gm);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue