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

WIP dockingport/multisub saving in single player mode

Browse Source
This commit is contained in:
Regalis
2016-07-02 14:59:49 +03:00
parent 17197a442d
commit cafeceb6d2
8 changed files with 402 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Map/Submarine.cs
+31 -21
View File
@@ -46,10 +46,12 @@ namespace Barotrauma
private SubmarineBody subBody;
public readonly List<Submarine> DockedTo;
private static Vector2 lastPickedPosition;
private static float lastPickedFraction;
Md5Hash hash;
private Md5Hash hash;
private string filePath;
private string name;
@@ -57,8 +59,7 @@ namespace Barotrauma
private Vector2 prevPosition;
private float lastNetworkUpdate;
//properties ----------------------------------------------------
public string Name
@@ -231,6 +232,8 @@ namespace Barotrauma
}
}
DockedTo = new List<Submarine>();
ID = ushort.MaxValue;
base.Remove();
@@ -538,14 +541,7 @@ namespace Barotrauma
name = System.IO.Path.GetFileNameWithoutExtension(filePath);
XDocument doc = new XDocument(new XElement("Submarine"));
doc.Root.Add(new XAttribute("name", name));
doc.Root.Add(new XAttribute("description", Description == null ? "" : Description));
foreach (MapEntity e in MapEntity.mapEntityList)
{
if (e.MoveWithLevel ||e.Submarine != this) continue;
e.Save(doc.Root);
}
SaveToXElement(doc.Root);
hash = new Md5Hash(doc);
doc.Root.Add(new XAttribute("md5hash", hash.Hash));
@@ -563,6 +559,18 @@ namespace Barotrauma
return true;
}
public void SaveToXElement(XElement element)
{
element.Add(new XAttribute("name", name));
element.Add(new XAttribute("description", Description == null ? "" : Description));
foreach (MapEntity e in MapEntity.mapEntityList)
{
if (e.MoveWithLevel || e.Submarine != this) continue;
e.Save(element);
}
}
public static bool SaveCurrent(string filePath)
{
if (Submarine.MainSub == null)
@@ -853,7 +861,7 @@ namespace Barotrauma
GameMain.LightManager.OnMapLoaded();
ID = (ushort)(ushort.MaxValue - Submarine.loaded.Count);
ID = (ushort)(ushort.MaxValue - Submarine.loaded.IndexOf(this));
}
public static Submarine Load(XElement element, bool unloadPrevious)
@@ -862,7 +870,7 @@ namespace Barotrauma
//tryload -> false
Submarine sub = new Submarine(ToolBox.GetAttributeString(element, "name", ""));
Submarine sub = new Submarine(ToolBox.GetAttributeString(element, "name", ""), "", false);
sub.Load(unloadPrevious, element);
return sub;
@@ -898,27 +906,29 @@ namespace Barotrauma
foreach (Submarine sub in loaded)
{
sub.Remove();
sub.Clear();
}
loaded.Clear();
}
private void Clear()
{
if (GameMain.GameScreen.Cam != null) GameMain.GameScreen.Cam.TargetPos = Vector2.Zero;
Entity.RemoveAll();
subBody = null;
PhysicsBody.list.Clear();
PhysicsBody.list.Clear();
Ragdoll.list.Clear();
GameMain.World.Clear();
}
public override void Remove()
{
base.Remove();
subBody = null;
DockedTo.Clear();
}
}
}