Merge pull request #204 from cortex-command-community/name-allowance

Name allowance

Author: garethyr

Activities/MultiplayerServerLobby.cpp

@@ -1042,11 +1042,7 @@ namespace RTE {
 		{
 			pScene = dynamic_cast<Scene *>(*pItr);
 			// Only add non-editor and non-special scenes, or ones that don't have locations defined, or have Test in their names, or are metascenes
-			if (pScene && !pScene->GetLocation().IsZero() &&
-				pScene->GetPresetName().find("Editor") == string::npos &&
-				pScene->GetPresetName().find("Test") == string::npos &&
-				!pScene->IsMetagameInternal() &&
-				(pScene->GetMetasceneParent() == "" || g_SettingsMan.ShowMetascenes()))
+			if (pScene && !pScene->GetLocation().IsZero() && !pScene->IsMetagameInternal() && (pScene->GetMetasceneParent() == "" || g_SettingsMan.ShowMetascenes()))
 				filteredScenes.push_back(pScene);
 		}
 

CHANGELOG.md

@@ -229,6 +229,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Damage to actors from impulses is now relative to their max health instead of being on a scale from 0 to 100.
 
+- Scenes with a PresetName containing the strings "Test", "Editor" and "Tutorial" are no longer excluded from the scenarios screen and from the metagame.
+
 ### Fixed
 
 - Fix crash when returning to `MetaGame` scenario screen after activity end.

Managers/MetaMan.cpp

@@ -995,12 +995,7 @@ int MetaMan::TotalScenePresets(std::list<Scene *> *pScenes)
     {
         pScenePreset = dynamic_cast<Scene *>(*sItr);
         // Filter out editor or special scenes, or ones that don't have locations defined.
-        if (pScenePreset && !pScenePreset->GetLocation().IsZero() &&
-            pScenePreset->IsMetagamePlayable() &&
-            pScenePreset->GetPresetName().find("Editor") == string::npos &&
-            pScenePreset->GetPresetName().find("Test") == string::npos &&
-            pScenePreset->GetPresetName().find("Tutorial") == string::npos && 
-			pScenePreset->GetMetasceneParent() == "")
+        if (pScenePreset && !pScenePreset->GetLocation().IsZero() && pScenePreset->IsMetagamePlayable() && pScenePreset->GetMetasceneParent() == "")
         {
             // Make sure this exact site location on the planet isn't occupied already
             locationOK = true;

Menus/ScenarioGUI.cpp

@@ -1720,12 +1720,8 @@ void ScenarioGUI::GetAllScenesAndActivities()
     {
         pScene = dynamic_cast<Scene *>(*pItr);
         // Only add non-editor and non-special scenes, or ones that don't have locations defined, or have Test in their names, or are metascenes
-		if (pScene && !pScene->GetLocation().IsZero() && 
-			pScene->GetPresetName().find("Editor") == string::npos && 
-			pScene->GetPresetName().find("Test") == string::npos && 
-			!pScene->IsMetagameInternal() && 
-			(pScene->GetMetasceneParent() == "" || g_SettingsMan.ShowMetascenes()))
-            filteredScenes.push_back(pScene);
+		if (pScene && !pScene->GetLocation().IsZero() && !pScene->IsMetagameInternal() && (pScene->GetMetasceneParent() == "" || g_SettingsMan.ShowMetascenes()))
+			filteredScenes.push_back(pScene);
     }
 
 	//Clear offsets