TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1396 from Azaezel/alpha41/goFilterFish

Browse source 
game mode filterfix
This commit is contained in:
Brian Roberts 2025-02-25 23:37:08 -06:00 • committed by GitHub
commit 3c358d45d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/SubScene.cpp
View file

@ -348,7 +348,7 @@ void SubScene::load()
return; return;
GameMode::findGameModes(mGameModesNames, &mGameModesList); GameMode::findGameModes(mGameModesNames, &mGameModesList);
if ((String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition()) if (!isSelected() && (String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition())
{ {
mLoaded = false; mLoaded = false;
return; return;

3
Engine/source/T3D/gameMode.cpp
View file

@ -101,7 +101,8 @@ void GameMode::findGameModes(const char* gameModeList, Vector<GameMode*> *outGam
GameMode* gm; GameMode* gm;
if (Sim::findObject(gameModeNames[i].c_str(), gm)) if (Sim::findObject(gameModeNames[i].c_str(), gm))
{ {
outGameModes->push_back(gm); if (gm->isActive() || gm->isAlwaysActive())
outGameModes->push_back(gm);
} }
} }
} }