initial cs-lua merge work
This commit is contained in:
@@ -660,7 +660,7 @@ namespace Barotrauma
|
||||
if (Math.Max(hull1.WorldSurface + hull1.WaveY[hull1.WaveY.Length - 1], hull2.WorldSurface + hull2.WaveY[0]) > WorldRect.Y) { return; }
|
||||
}
|
||||
|
||||
var should = new LuaResult(GameMain.Lua.hook.Call("gapOxygenUpdate", new object[] { this, hull1, hull2 }));
|
||||
var should = new LuaResult(GameMain.LuaCs.hook.Call("gapOxygenUpdate", this, hull1, hull2));
|
||||
|
||||
if (should.Bool())
|
||||
return;
|
||||
|
||||
@@ -596,12 +596,12 @@ namespace Barotrauma
|
||||
Powered.UpdatePower(deltaTime * MapEntityUpdateInterval);
|
||||
foreach (Item item in Item.ItemList)
|
||||
{
|
||||
if (GameMain.Lua.game.updatePriorityItems.Contains(item)) continue;
|
||||
if (GameMain.LuaCs.game.updatePriorityItems.Contains(item)) continue;
|
||||
item.Update(deltaTime * MapEntityUpdateInterval, cam);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var item in GameMain.Lua.game.updatePriorityItems)
|
||||
foreach (var item in GameMain.LuaCs.game.updatePriorityItems)
|
||||
{
|
||||
if (item.Removed) continue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user