Config: Give Movie and Netplay higher priority than CommandLine

Avoiding desyncs is more important than honoring what the user
specified on the command line.
This commit is contained in:
JosJuice 2021-03-06 20:00:07 +01:00
parent a9862b5395
commit 359ed5348a

View File

@ -8,14 +8,15 @@
namespace Config namespace Config
{ {
// Layers in ascending order of priority.
enum class LayerType enum class LayerType
{ {
Base, Base,
CommandLine,
GlobalGame, GlobalGame,
LocalGame, LocalGame,
Movie, Movie,
Netplay, Netplay,
CommandLine,
CurrentRun, CurrentRun,
Meta, Meta,
}; };
@ -36,11 +37,11 @@ enum class System
constexpr std::array<LayerType, 7> SEARCH_ORDER{{ constexpr std::array<LayerType, 7> SEARCH_ORDER{{
LayerType::CurrentRun, LayerType::CurrentRun,
LayerType::CommandLine,
LayerType::Movie,
LayerType::Netplay, LayerType::Netplay,
LayerType::Movie,
LayerType::LocalGame, LayerType::LocalGame,
LayerType::GlobalGame, LayerType::GlobalGame,
LayerType::CommandLine,
LayerType::Base, LayerType::Base,
}}; }};
} // namespace Config } // namespace Config