Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

This commit is contained in:
Evil Factory
2022-04-08 12:52:28 -03:00
990 changed files with 44338 additions and 38589 deletions
@@ -54,14 +54,14 @@ namespace Barotrauma
}
}
public string SelectedModeIdentifier
public Identifier SelectedModeIdentifier
{
get { return GameModes[SelectedModeIndex].Identifier; }
set
{
for (int i = 0; i < GameModes.Length; i++)
{
if (GameModes[i].Identifier.ToLower() == value.ToLower())
if (GameModes[i].Identifier == value)
{
SelectedModeIndex = i;
break;
@@ -197,7 +197,7 @@ namespace Barotrauma
public override void Select()
{
base.Select();
GameMain.Server.ServerSettings.Voting.ResetVotes(GameMain.Server.ConnectedClients);
GameMain.Server.Voting.ResetVotes(GameMain.Server.ConnectedClients);
if (SelectedMode != GameModePreset.MultiPlayerCampaign && GameMain.GameSession?.GameMode is CampaignMode && Selected == this)
{
GameMain.GameSession = null;