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

Progress (compiles now)

Browse Source
This commit is contained in:
Regalis
2016-06-09 22:15:50 +03:00
parent c9fd599276
commit 7349cdd310
22 changed files with 237 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Screens/EditMapScreen.cs
+17 -15
View File
@@ -46,7 +46,7 @@ namespace Barotrauma
public string GetSubName()
{
return ((Submarine.Loaded == null) ? "" : Submarine.Loaded.Name);
return (Submarine.MainSub == null) ? "" : Submarine.MainSub.Name;
}
private string GetItemCount()
@@ -231,11 +231,11 @@ namespace Barotrauma
GUIComponent.MouseOn = null;
characterMode = false;
if (Submarine.Loaded != null)
if (Submarine.MainSub != null)
{
cam.Position = Submarine.Loaded.Position + Submarine.HiddenSubPosition;
nameBox.Text = Submarine.Loaded.Name;
descriptionBox.Text = ToolBox.LimitString(Submarine.Loaded.Description,15);
cam.Position = Submarine.MainSub.Position + Submarine.HiddenSubPosition;
nameBox.Text = Submarine.MainSub.Name;
descriptionBox.Text = ToolBox.LimitString(Submarine.MainSub.Description, 15);
}
else
{
@@ -303,9 +303,9 @@ namespace Barotrauma
string savePath = nameBox.Text + ".sub";
if (Submarine.Loaded != null)
if (Submarine.MainSub != null)
{
savePath = Path.Combine(Path.GetDirectoryName(Submarine.Loaded.FilePath), savePath);
savePath = Path.Combine(Path.GetDirectoryName(Submarine.MainSub.FilePath), savePath);
}
else
{
@@ -313,9 +313,9 @@ namespace Barotrauma
}
Submarine.SaveCurrent(savePath);
Submarine.Loaded.CheckForErrors();
Submarine.MainSub.CheckForErrors();
GUI.AddMessage("Submarine saved to " + Submarine.Loaded.FilePath, Color.Green, 3.0f);
GUI.AddMessage("Submarine saved to " + Submarine.MainSub.FilePath, Color.Green, 3.0f);
return false;
}
@@ -560,7 +560,7 @@ namespace Barotrauma
return false;
}
if (Submarine.Loaded != null) Submarine.Loaded.Name = text;
if (Submarine.MainSub != null) Submarine.MainSub.Name = text;
textBox.Deselect();
textBox.Text = text;
@@ -572,9 +572,9 @@ namespace Barotrauma
private bool ChangeSubDescription(GUITextBox textBox, string text)
{
if (Submarine.Loaded != null)
if (Submarine.MainSub != null)
{
Submarine.Loaded.Description = text;
Submarine.MainSub.Description = text;
}
else
{
@@ -593,9 +593,9 @@ namespace Barotrauma
private void ExpandDescriptionBox(GUITextBox textBox, Keys key)
{
if (Submarine.Loaded != null)
if (Submarine.MainSub != null)
{
textBox.Text = Submarine.Loaded.Description;
textBox.Text = Submarine.MainSub.Description;
}
else if (textBox.UserData is string)
{
@@ -617,7 +617,9 @@ namespace Barotrauma
private bool GenerateWaypoints(GUIButton button, object obj)
{
WayPoint.GenerateSubWaypoints();
if (Submarine.MainSub == null) return false;
WayPoint.GenerateSubWaypoints(Submarine.MainSub);
return true;
}
Subsurface/Source/Screens/GameScreen.cs
+12 -7
View File
@@ -56,9 +56,9 @@ namespace Barotrauma
{
cam.Position = Character.Controlled.WorldPosition;
}
else if (Submarine.Loaded != null)
else if (Submarine.MainSub != null)
{
cam.Position = Submarine.Loaded.WorldPosition;
cam.Position = Submarine.MainSub.WorldPosition;
}
foreach (MapEntity entity in MapEntity.mapEntityList)
@@ -119,9 +119,11 @@ namespace Barotrauma
//Lights.LightManager.ViewPos = Character.Controlled.WorldPosition;
}
cam.MoveCamera((float)Physics.step);
if (Submarine.Loaded != null) Submarine.Loaded.SetPrevTransform(Submarine.Loaded.Position);
foreach (Submarine sub in Submarine.Loaded)
{
sub.SetPrevTransform(sub.Position);
}
foreach (PhysicsBody pb in PhysicsBody.list)
{
@@ -175,7 +177,7 @@ namespace Barotrauma
if (GameMain.GameSession != null) GameMain.GameSession.Draw(spriteBatch);
if (Character.Controlled == null && Submarine.Loaded != null) DrawSubmarineIndicator(spriteBatch, Submarine.Loaded);
if (Character.Controlled == null && Submarine.Loaded != null) DrawSubmarineIndicator(spriteBatch, Submarine.MainSub);
GUI.Draw((float)deltaTime, spriteBatch, cam);
@@ -187,7 +189,10 @@ namespace Barotrauma
public void DrawMap(GraphicsDevice graphics, SpriteBatch spriteBatch)
{
if (Submarine.Loaded != null) Submarine.Loaded.UpdateTransform();
foreach (Submarine sub in Submarine.Loaded)
{
sub.UpdateTransform();
}
GameMain.LightManager.ObstructVision = Character.Controlled != null && Character.Controlled.ObstructVision;