added more actions and moved lobby update to networking which makes more sense
This commit is contained in:
@@ -28,8 +28,6 @@ namespace Barotrauma
|
||||
|
||||
public ServerSettings ServerSettings => GameMain.Server.ServerSettings;
|
||||
|
||||
public void ClientWriteLobby(Client client) => GameMain.Server.ClientWriteLobby(client);
|
||||
|
||||
public static void SendMessage(string msg, ChatMessageType? messageType = null, Client sender = null, Character character = null)
|
||||
{
|
||||
GameMain.Server.SendChatMessage(msg, messageType, sender, character);
|
||||
|
||||
@@ -462,6 +462,8 @@ namespace Barotrauma
|
||||
}
|
||||
|
||||
#if SERVER
|
||||
public void ClientWriteLobby(Client client) => GameMain.Server.ClientWriteLobby(client);
|
||||
|
||||
public void Send(IWriteMessage netMessage, NetworkConnection connection = null, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable)
|
||||
{
|
||||
if (connection == null)
|
||||
|
||||
@@ -12,11 +12,13 @@ namespace Barotrauma
|
||||
|
||||
public static void RegisterAll()
|
||||
{
|
||||
RegisterSimpleAction<Item>();
|
||||
RegisterSimpleAction();
|
||||
RegisterAction<Item>();
|
||||
RegisterAction<Character>();
|
||||
RegisterAction<Entity>();
|
||||
RegisterAction();
|
||||
}
|
||||
|
||||
public static void RegisterSimpleAction<T>()
|
||||
public static void RegisterAction<T>()
|
||||
{
|
||||
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Action<T>), v =>
|
||||
{
|
||||
@@ -27,7 +29,7 @@ namespace Barotrauma
|
||||
|
||||
|
||||
|
||||
public static void RegisterSimpleAction()
|
||||
public static void RegisterAction()
|
||||
{
|
||||
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(Action), v =>
|
||||
{
|
||||
|
||||
@@ -338,7 +338,7 @@ namespace Barotrauma
|
||||
AddCallMetaMember(UserData.RegisterType<Color>());
|
||||
AddCallMetaMember(UserData.RegisterType<Point>());
|
||||
AddCallMetaMember(UserData.RegisterType<SubmarineInfo>());
|
||||
|
||||
|
||||
#if SERVER
|
||||
|
||||
#elif CLIENT
|
||||
|
||||
Reference in New Issue
Block a user