added Game.ServerSettings for clients and Game.Client/Game.Server

This commit is contained in:
EvilFactory
2022-08-10 16:52:54 -03:00
parent 412a9e0055
commit 4bccc33c4f
@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
@@ -16,6 +16,14 @@ namespace Barotrauma
public bool IsMultiplayer => GameMain.IsMultiplayer; public bool IsMultiplayer => GameMain.IsMultiplayer;
#if CLIENT #if CLIENT
public GameClient Client
{
get
{
return GameMain.Client;
}
}
public bool? ForceVoice = null; public bool? ForceVoice = null;
public bool? ForceLocalVoice = null; public bool? ForceLocalVoice = null;
@@ -65,7 +73,15 @@ namespace Barotrauma
return Screen.Selected is SubEditorScreen; return Screen.Selected is SubEditorScreen;
} }
} }
#else #else
public GameServer Server
{
get
{
return GameMain.Server;
}
}
public bool IsDedicated public bool IsDedicated
{ {
@@ -74,12 +90,21 @@ namespace Barotrauma
return GameMain.Server.ServerPeer is LidgrenServerPeer; return GameMain.Server.ServerPeer is LidgrenServerPeer;
} }
} }
public ServerSettings ServerSettings => GameMain.Server.ServerSettings;
#endif #endif
public DynValue Settings; public ServerSettings ServerSettings
{
get
{
#if SERVER
return GameMain.Server.ServerSettings;
#else
return GameMain.Client.ServerSettings;
#endif
}
}
public DynValue Settings;
public bool allowWifiChat = false; public bool allowWifiChat = false;
public bool overrideTraitors = false; public bool overrideTraitors = false;
@@ -466,4 +491,4 @@ namespace Barotrauma
} }
} }
} }