initial cs-lua merge work
This commit is contained in:
@@ -25,7 +25,7 @@ namespace Barotrauma
|
||||
GameServer.Log(GameServer.CharacterLogName(this) + " has died (Cause of death: " + causeOfDeath + ")", ServerLog.MessageType.Attack);
|
||||
}
|
||||
}
|
||||
GameMain.Lua.hook.Call("characterDeath", new object[] { this,causeOfDeathAffliction });
|
||||
GameMain.LuaCs.hook.Call("characterDeath", this,causeOfDeathAffliction);
|
||||
|
||||
if (HasAbilityFlag(AbilityFlags.RetainExperienceForNewCharacter))
|
||||
{
|
||||
@@ -43,7 +43,7 @@ namespace Barotrauma
|
||||
var owner = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
|
||||
if (owner != null)
|
||||
{
|
||||
if (!GameMain.Lua.game.overrideTraitors)
|
||||
if (!GameMain.LuaCs.game.overrideTraitors)
|
||||
{
|
||||
GameMain.Server.SendDirectChatMessage(TextManager.FormatServerMessage("KilledByTraitorNotification"), owner, ChatMessageType.ServerMessageBoxInGame);
|
||||
}
|
||||
|
||||
@@ -700,7 +700,7 @@ namespace Barotrauma
|
||||
|
||||
var tempBuffer = new ReadWriteMessage();
|
||||
WriteStatus(tempBuffer);
|
||||
if (msgLengthBeforeStatus + tempBuffer.LengthBytes >= 255 && restrictMessageSize && GameMain.Lua.networking.restrictMessageSize)
|
||||
if (msgLengthBeforeStatus + tempBuffer.LengthBytes >= 255 && restrictMessageSize && GameMain.LuaCs.networking.restrictMessageSize)
|
||||
{
|
||||
msg.Write(false);
|
||||
if (msgLengthBeforeStatus < 255)
|
||||
|
||||
Reference in New Issue
Block a user