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

Ragdoll raycast crash, holding items in correct angles, ghost wires, dropping items properly in editmapscreen, radar wont work without power, remove wire from connectors if its deleted

Browse Source
This commit is contained in:
Regalis
2015-10-26 01:46:52 +02:00
parent aeeae13b35
commit ebe248a7cc
25 changed files with 142 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Item.cs
+15 -3
View File
@@ -333,7 +333,19 @@ namespace Barotrauma
public void SetTransform(Vector2 simPosition, float rotation)
{
if (body != null) body.SetTransform(simPosition, rotation);
if (body != null)
{
try
{
body.SetTransform(simPosition, rotation);
}
catch (Exception e)
{
#if DEBUG
DebugConsole.ThrowError("Failed to set item transform", e);
#endif
}
}
Vector2 displayPos = ConvertUnits.ToDisplayUnits(simPosition);
@@ -803,7 +815,7 @@ namespace Barotrauma
foreach (Item item in itemList)
{
if (ignoredItems!=null && ignoredItems.Contains(item)) continue;
if (hull != item.CurrentHull && (hull==null || (item.Rect.Height<hull.Rect.Height && item.rect.Width < hull.Rect.Width))) continue;
//if (hull != item.CurrentHull && (hull==null || (item.Rect.Height<hull.Rect.Height && item.rect.Width < hull.Rect.Width))) continue;
if (item.body != null && !item.body.Enabled) continue;
Pickable pickableComponent = item.GetComponent<Pickable>();
@@ -813,7 +825,7 @@ namespace Barotrauma
{
Rectangle transformedTrigger = item.TransformTrigger(trigger);
if (!Submarine.RectContains(transformedTrigger, displayPos))continue;
if (!Submarine.RectContains(transformedTrigger, displayPos)) continue;
Vector2 triggerCenter =
new Vector2(