initial cs-lua merge work
This commit is contained in:
@@ -387,7 +387,7 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
Limb targetLimb = target.UserData as Limb;
|
||||
Character targetCharacter = targetLimb?.character ?? target.UserData as Character;
|
||||
GameMain.Lua.hook.Call("meleeWeapon.handleImpact", this, target);
|
||||
GameMain.LuaCs.hook.Call("meleeWeapon.handleImpact", this, target);
|
||||
if (Attack != null)
|
||||
{
|
||||
Attack.SetUser(User);
|
||||
|
||||
@@ -325,8 +325,8 @@ namespace Barotrauma.Items.Components
|
||||
Connection connection = recipient;
|
||||
|
||||
object[] obj = new object[] { signal, connection };
|
||||
GameMain.Lua.hook.Call("signalReceived", obj);
|
||||
GameMain.Lua.hook.Call("signalReceived." + recipient.item.Prefab.Identifier, obj);
|
||||
GameMain.LuaCs.hook.Call("signalReceived", obj);
|
||||
GameMain.LuaCs.hook.Call("signalReceived." + recipient.item.Prefab.Identifier, obj);
|
||||
|
||||
foreach (ItemComponent ic in recipient.item.Components)
|
||||
{
|
||||
|
||||
@@ -74,7 +74,7 @@ namespace Barotrauma.Items.Components
|
||||
#if SERVER
|
||||
get
|
||||
{
|
||||
if(GameMain.Lua.game.allowWifiChat) return true;
|
||||
if(GameMain.LuaCs.game.allowWifiChat) return true;
|
||||
return linkToChat;
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
public void TransmitSignal(Signal signal, bool sentFromChat)
|
||||
{
|
||||
var should = new LuaResult(GameMain.Lua.hook.Call("wifiSignalTransmitted", new object[] { this, signal, sentFromChat }));
|
||||
var should = new LuaResult(GameMain.LuaCs.hook.Call("wifiSignalTransmitted", new object[] { this, signal, sentFromChat }));
|
||||
|
||||
if (should.Bool())
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user