Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change cvar usages to use CVarDef and define them in CCVars (#2250)

Browse Source 
* Change cvar usages to use CVarDef and define them in CCVars

* Merge fixes

* Remove duplicate cvar registration
This commit is contained in:
DrSmugleaf
2020-11-07 01:15:56 +01:00
committed by GitHub
parent a7e7f20417
commit bf5b9ad03b
19 changed files with 136 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
View File

@@ -1,6 +1,7 @@
using System.Threading.Tasks;
using Content.Server.GameTicking;
using Content.Server.Interfaces.GameTicking;
using Content.Shared;
using NUnit.Framework;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.Interfaces.GameObjects;
@@ -31,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Commands
server.Assert(() =>
{
configManager.SetCVar("game.lobbyenabled", lobbyEnabled);
configManager.SetCVar(CCVars.GameLobbyEnabled, lobbyEnabled);
Assert.That(gameTicker.RunLevel, Is.EqualTo(GameRunLevel.InRound));

4
Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
View File

@@ -38,9 +38,7 @@ namespace Content.IntegrationTests.Tests.Lobby
await server.WaitAssertion(() =>
{
var lobbyCvar = CCVars.GameLobbyEnabled;
serverConfig.SetCVar(lobbyCvar.Name, true);
serverConfig.SetCVar(CCVars.GameLobbyEnabled, true);
serverTicker.RestartRound();
});