Skip to content

Commit 436cba7

Browse files
committed
Allow Fields.MatchRendering to be a bool
1 parent 0895ae0 commit 436cba7

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

RLBotCS/ManagerTools/ConfigParser.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -824,11 +824,26 @@ public MatchConfigurationT LoadMatchConfig(string path)
824824
Fields.MatchStartWithoutCountdown,
825825
false
826826
);
827-
matchConfig.EnableRendering = GetEnum(
828-
matchTable,
829-
Fields.MatchRendering,
830-
DebugRendering.OffByDefault
831-
);
827+
828+
matchConfig.EnableRendering = DebugRendering.OffByDefault;
829+
if (
830+
matchTable.TryGetValue(Fields.MatchRendering, out var raw)
831+
&& raw is bool enableRendering
832+
)
833+
{
834+
matchConfig.EnableRendering = enableRendering
835+
? DebugRendering.OnByDefault
836+
: DebugRendering.AlwaysOff;
837+
}
838+
else
839+
{
840+
matchConfig.EnableRendering = GetEnum(
841+
matchTable,
842+
Fields.MatchRendering,
843+
DebugRendering.OffByDefault
844+
);
845+
}
846+
832847
matchConfig.EnableStateSetting = GetValue(
833848
matchTable,
834849
Fields.MatchStateSetting,

RLBotCSTests/ConfigParserTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public void EdgeCases()
9393
ConfigParser parser = new();
9494
MatchConfigurationT edgeMC = parser.LoadMatchConfig("TestTomls/edge.toml");
9595

96+
Assert.AreEqual(DebugRendering.AlwaysOff, edgeMC.EnableRendering);
9697
Assert.AreEqual(Launcher.Custom, edgeMC.Launcher);
9798
// Ok for parsing, but wil not go through ConfigValidator
9899
Assert.AreEqual("something invalid", edgeMC.LauncherArg);

RLBotCSTests/TestTomls/edge.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ launcher_arg = "something invalid"
77
[match]
88
game_mode = "Soccar"
99
game_map_upk = "Stadium_P"
10+
enable_rendering = false
1011

1112
[mutators]
1213
match_length = "TenMinutes"

0 commit comments

Comments
 (0)