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

misc UI stuff, gamesession additions, limbs don't have individual health anymore, background music

Browse Source
This commit is contained in:
Regalis
2015-06-09 18:18:34 +03:00
parent d3896383fd
commit d7fde606e9
50 changed files with 595 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Map/Map.cs
+14 -6
View File
@@ -287,7 +287,7 @@ namespace Subsurface
try
{
//string docString = doc.ToString();
ToolBox.CompressStringToFile(filePath+".gz", doc.ToString());
ToolBox.CompressStringToFile(filePath, doc.ToString());
}
catch
{
@@ -295,7 +295,7 @@ namespace Subsurface
}
doc.Save(filePath);
//doc.Save(filePath);
}
public static void PreloadMaps(string mapFolder)
@@ -342,7 +342,15 @@ namespace Subsurface
public Map(string filePath, string mapHash="")
{
this.filePath = filePath;
name = Path.GetFileNameWithoutExtension(filePath);
try
{
name = Path.GetFileNameWithoutExtension(filePath);
}
catch (Exception e)
{
DebugConsole.ThrowError("Error loading map " + filePath + "!", e);
}
if (mapHash != "")
{
@@ -505,12 +513,12 @@ namespace Subsurface
{
filePath = "";
if (Game1.gameScreen.Cam != null) Game1.gameScreen.Cam.TargetPos = Vector2.Zero;
if (Game1.GameScreen.Cam != null) Game1.GameScreen.Cam.TargetPos = Vector2.Zero;
Entity.RemoveAll();
if (Game1.gameSession!=null)
Game1.gameSession.crewManager.EndShift();
if (Game1.GameSession!=null)
Game1.GameSession.crewManager.EndShift();
PhysicsBody.list.Clear();