vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multiplayer fixes

Browse Source
This commit is contained in:
Regalis
2015-12-12 16:23:01 +02:00
parent 17e8a2171f
commit 04cfca0ede
14 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/Machines/Controller.cs
+3 -3
View File
@@ -118,7 +118,7 @@ namespace Barotrauma.Items.Components
fmj.WorldAnchorB = position;
}
item.SendSignal(ToolBox.Vector2ToString(character.CursorPosition), "position_out");
item.SendSignal(ToolBox.Vector2ToString(character.CursorWorldPosition), "position_out");
}
public override bool Use(float deltaTime, Character activator = null)
@@ -152,12 +152,12 @@ namespace Barotrauma.Items.Components
{
if (c2 == null || c2.Item==null || !c2.Item.Prefab.FocusOnSelected) continue;
Vector2 centerPos = c2.Item.Position;
Vector2 centerPos = c2.Item.WorldPosition;
if (character == Character.Controlled && cam != null)
{
Lights.LightManager.ViewPos = centerPos;
cam.TargetPos = c2.Item.Position;
cam.TargetPos = c2.Item.WorldPosition;
}
break;
Subsurface/Source/Items/Components/Machines/Radar.cs
+4 -1
View File
@@ -50,6 +50,8 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam)
{
currPowerConsumption = powerConsumption;
base.Update(deltaTime, cam);
for (int i = radarBlips.Count - 1; i >= 0; i-- )
@@ -71,6 +73,8 @@ namespace Barotrauma.Items.Components
{
pingState = 0.0f;
}
voltage = 0.0f;
}
public override bool Use(float deltaTime, Character character = null)
@@ -262,7 +266,6 @@ namespace Barotrauma.Items.Components
prevPos = pos;
}
voltage = 0.0f;
}
private void DrawBlip(SpriteBatch spriteBatch, RadarBlip blip, Vector2 center, Color color, float radius)