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

autoupdater fixes, cursor fix, consistent directory separators + use of Path.Combine(), wire bugfixes, more loading screens

Browse Source
This commit is contained in:
Regalis
2015-10-02 21:33:33 +03:00
parent 24f7a1baa5
commit a285b00eb9
51 changed files with 451 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Map/Explosion.cs
View File

@@ -126,7 +126,7 @@ namespace Subsurface
distFactor = 1.0f - Vector2.Distance(limb.SimPosition, simPosition)/attack.Range;
c.AddDamage(limb.SimPosition, DamageType.None,
attack.GetDamage(1.0f) / c.AnimController.Limbs.Length * distFactor, 0.0f, attack.Stun * distFactor, true);
attack.GetDamage(1.0f) / c.AnimController.Limbs.Length * distFactor, 0.0f, attack.Stun * distFactor, false);
if (force>0.0f)
{
limb.body.ApplyLinearImpulse(Vector2.Normalize(limb.SimPosition - simPosition) * distFactor * force);

28
Subsurface/Source/Map/Submarine.cs
View File

@@ -22,6 +22,8 @@ namespace Subsurface
class Submarine : Entity
{
public const string SavePath = "Data/SavedSubs";
public static List<Submarine> SavedSubmarines = new List<Submarine>();
public static readonly Vector2 GridSize = new Vector2(16.0f, 16.0f);
@@ -33,7 +35,6 @@ namespace Subsurface
private static Vector2 lastPickedPosition;
private static float lastPickedFraction;
static string SaveFolder;
Md5Hash hash;
private string filePath;
@@ -448,35 +449,34 @@ namespace Subsurface
//doc.Save(filePath);
}
public static void SaveCurrent(string savePath)
public static void SaveCurrent(string fileName)
{
if (loaded==null)
{
loaded = new Submarine(savePath);
loaded = new Submarine(fileName);
// return;
}
loaded.SaveAs(savePath);
loaded.SaveAs(SavePath+"/"+fileName);
}
public static void Preload(string folder)
public static void Preload()
{
SaveFolder = folder;
//string[] mapFilePaths;
Unload();
SavedSubmarines.Clear();
if (!Directory.Exists(SaveFolder))
if (!Directory.Exists(SavePath))
{
try
{
Directory.CreateDirectory(SaveFolder);
Directory.CreateDirectory(SavePath);
}
catch
catch (Exception e)
{
DebugConsole.ThrowError("Directory ''"+SaveFolder+"'' not found and creating the directory failed.");
DebugConsole.ThrowError("Directory ''" + SavePath + "'' not found and creating the directory failed.", e);
return;
}
}
@@ -485,11 +485,11 @@ namespace Subsurface
try
{
filePaths = Directory.GetFiles(SaveFolder);
filePaths = Directory.GetFiles(SavePath);
}
catch (Exception e)
{
DebugConsole.ThrowError("Couldn't open directory ''" + SaveFolder + "''!", e);
DebugConsole.ThrowError("Couldn't open directory ''" + SavePath + "''!", e);
return;
}
@@ -618,11 +618,11 @@ namespace Subsurface
loaded = this;
}
public static Submarine Load(string file)
public static Submarine Load(string fileName)
{
Unload();
Submarine sub = new Submarine(file);
Submarine sub = new Submarine(SavePath+"/"+fileName);
sub.Load();
//Entity.dictionary.Add(int.MaxValue, sub);