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

Merge branch 'master' of https://bitbucket.org/Regalis11/barotrauma

Browse Source
This commit is contained in:
Regalis
2016-03-03 21:56:29 +02:00
parent b4ff867607 0b7b52256b
commit 6240f98f14
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Item.cs
+2 -1
View File
@@ -642,7 +642,8 @@ namespace Barotrauma
body.ResetDynamics(); body.ResetDynamics();
} }
body.ApplyForce(buoyancy - body.LinearVelocity * volume); body.ApplyForce(buoyancy - body.LinearVelocity * volume);
CurrentHull.HandleItems(deltaTime, this); if(CurrentHull != null)
CurrentHull.HandleItems(deltaTime, this);
//apply simple angular drag //apply simple angular drag
body.ApplyTorque(body.AngularVelocity * volume * -0.05f); body.ApplyTorque(body.AngularVelocity * volume * -0.05f);
} }
Subsurface/Source/Map/Hull.cs
+1 -2
View File
@@ -469,8 +469,7 @@ namespace Barotrauma
var uplift = -GameMain.World.Gravity*(forceFactor - body.body.LinearVelocity.Y*5); var uplift = -GameMain.World.Gravity*(forceFactor - body.body.LinearVelocity.Y*5);
body.body.FarseerBody.ApplyForce(uplift*deltaTime); body.body.FarseerBody.ApplyForce(uplift*deltaTime);
var gap = var gap = ConnectedGaps.Where(i => i.Open > 0).OrderBy(i => i.LerpedFlowForce.Length()).FirstOrDefault();
ConnectedGaps.Where(i => i.Open > 0).OrderBy(i => Vector2.Distance(body.Position, i.Position)).FirstOrDefault();
if (gap == null || gap.LerpedFlowForce.Length() < 0) if (gap == null || gap.LerpedFlowForce.Length() < 0)
return; return;
var pos = gap.Position - body.Position; var pos = gap.Position - body.Position;