Better UI scaling, quest tweaking, contentpackage hash bugfix, misc bugfixes

This commit is contained in:
Regalis
2015-07-30 23:28:15 +03:00
parent c7dd6e55f0
commit 23d847a4ac
29 changed files with 287 additions and 138 deletions
@@ -459,7 +459,7 @@ namespace Subsurface.Items.Components
if (Wires[i]!=null)
{
Wires[i].Item.body.Enabled = false;
Wires[i].Connect(this, false);
Wires[i].Connect(this, false, true);
}
}
@@ -91,6 +91,11 @@ namespace Subsurface.Items.Components
}
}
public override void Remove()
{
base.Remove();
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
{
foreach (Connection c in connections)
+2 -3
View File
@@ -61,7 +61,7 @@ namespace Subsurface.Items.Components
if (connection == connections[1]) connections[1] = null;
}
public void Connect(Connection newConnection, bool addNode = true)
public void Connect(Connection newConnection, bool addNode = true, bool loading = false)
{
for (int i = 0; i < 2; i++)
{
@@ -85,7 +85,6 @@ namespace Subsurface.Items.Components
Nodes.Add(newConnection.Item.Position);
}
break;
}
@@ -110,7 +109,7 @@ namespace Subsurface.Items.Components
CleanNodes();
}
Item.NewComponentEvent(this, true);
if (!loading) Item.NewComponentEvent(this, true);
}
public override void Equip(Character character)