Progress (compiles now)

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
+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;