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

Topwindow sprite fix, fixed null reference exception when welding/cutting walls that aren't part of a sub

Browse Source
This commit is contained in:
Regalis
2016-09-21 19:39:00 +03:00
parent 96a61ab2ea
commit b01b52172a
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Map/StructurePrefabs.xml
+7 -7
View File
@@ -109,23 +109,23 @@
</CableHolderVertical> </CableHolderVertical>
<topwindow width="128" height="49" body="true" health="100"> <topwindow width="128" height="49" body="true" health="100">
<sprite texture="Content/Map/testroom.png" sourcerect="208,880,128,48" depth ="0.05"/> <sprite texture="Content/Map/testroom.png" sourcerect="208,848,128,80" depth ="0.05"/>
<backgroundsprite texture="Content/Map/testroom.png" sourcerect="344,880,128,48" depth ="0.85"/> <backgroundsprite texture="Content/Map/testroom.png" sourcerect="344,848,128,80" depth ="0.85"/>
</topwindow> </topwindow>
<verticalwindow width="128" height ="224" body="true" health="100"> <verticalwindow width="128" height ="224" body="true" health="100">
<sprite texture="Content/Map/testroom.png" sourcerect="368,576,128,224" depth ="0.05"/> <sprite texture="Content/Map/testroom.png" sourcerect="368,544,128,224" depth ="0.05"/>
<backgroundsprite texture="Content/Map/testroom.png" sourcerect="239,576,128,224" depth ="0.85"/> <backgroundsprite texture="Content/Map/testroom.png" sourcerect="239,544,128,224" depth ="0.85"/>
</verticalwindow> </verticalwindow>
<horizontalresizablewindow width="128" height ="64" body="true" health="100" resizehorizontal="true"> <horizontalresizablewindow width="128" height ="64" body="true" health="100" resizehorizontal="true">
<sprite texture="Content/Map/testroom.png" sourcerect="207,803,128,64" depth ="0.06"/> <sprite texture="Content/Map/testroom.png" sourcerect="207,771,128,64" depth ="0.06"/>
<backgroundsprite texture="Content/Map/testroom.png" sourcerect="337,803,128,64" depth ="0.06"/> <backgroundsprite texture="Content/Map/testroom.png" sourcerect="337,771,128,64" depth ="0.85"/>
</horizontalresizablewindow> </horizontalresizablewindow>
<verticalresizablewindow width = "64" height ="128" body="true" health="100" resizevertical="true"> <verticalresizablewindow width = "64" height ="128" body="true" health="100" resizevertical="true">
<sprite texture="Content/Map/testroom.png" sourcerect="896,80,64,128" depth ="0.06"/> <sprite texture="Content/Map/testroom.png" sourcerect="896,80,64,128" depth ="0.06"/>
<backgroundsprite texture="Content/Map/testroom.png" sourcerect="961,80,64,128" depth ="0.06"/> <backgroundsprite texture="Content/Map/testroom.png" sourcerect="961,80,64,128" depth ="0.85"/>
</verticalresizablewindow> </verticalresizablewindow>
<smallhorizontalback description="A decorative structure with no collision detection" <smallhorizontalback description="A decorative structure with no collision detection"
Subsurface/Content/Map/testroom.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

Subsurface/Source/Items/Components/Holdable/RepairTool.cs
+7 -3
View File
@@ -183,9 +183,15 @@ namespace Barotrauma.Items.Components
int sectionIndex = targetStructure.FindSectionIndex(ConvertUnits.ToDisplayUnits(pickedPosition)); int sectionIndex = targetStructure.FindSectionIndex(ConvertUnits.ToDisplayUnits(pickedPosition));
if (sectionIndex < 0) return; if (sectionIndex < 0) return;
Vector2 progressBarPos = targetStructure.SectionPosition(sectionIndex);
if (targetStructure.Submarine != null)
{
progressBarPos += targetStructure.Submarine.DrawPosition;
}
var progressBar = user.UpdateHUDProgressBar( var progressBar = user.UpdateHUDProgressBar(
targetStructure, targetStructure,
targetStructure.SectionPosition(sectionIndex) + targetStructure.Submarine.DrawPosition, progressBarPos,
1.0f - targetStructure.SectionDamage(sectionIndex) / targetStructure.Health, 1.0f - targetStructure.SectionDamage(sectionIndex) / targetStructure.Health,
Color.Red, Color.Green); Color.Red, Color.Green);
@@ -206,8 +212,6 @@ namespace Barotrauma.Items.Components
targetStructure.AddDamage(sectionIndex + i, -StructureFixAmount * degreeOfSuccess); targetStructure.AddDamage(sectionIndex + i, -StructureFixAmount * degreeOfSuccess);
} }
} }
} }
else if ((targetLimb = (targetBody.UserData as Limb)) != null) else if ((targetLimb = (targetBody.UserData as Limb)) != null)
{ {