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

Level wall generation bugfixes, moved level background drawing to LevelRenderer, more coordinate system bugfixes, better looking progress bars,

Browse Source
This commit is contained in:
Regalis
2015-12-14 18:59:59 +02:00
parent c74caadc42
commit 859be53d28
28 changed files with 318 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Map/Hull.cs
+5 -5
View File
@@ -479,21 +479,21 @@ namespace Barotrauma
}
//returns the water block which contains the point (or null if it isn't inside any)
public static Hull FindHull(Vector2 worldPosition, Hull guess = null)
public static Hull FindHull(Vector2 position, Hull guess = null, bool useWorldCoordinates = true)
{
return FindHull(worldPosition, hullList, guess);
return FindHull(position, hullList, guess, useWorldCoordinates);
}
public static Hull FindHull(Vector2 worldPosition, List<Hull> hulls, Hull guess = null)
public static Hull FindHull(Vector2 position, List<Hull> hulls, Hull guess = null, bool useWorldCoordinates = true)
{
if (guess != null && hulls.Contains(guess))
{
if (Submarine.RectContains(guess.WorldRect, worldPosition)) return guess;
if (Submarine.RectContains(useWorldCoordinates ? guess.WorldRect : guess.rect, position)) return guess;
}
foreach (Hull hull in hulls)
{
if (Submarine.RectContains(hull.WorldRect, worldPosition)) return hull;
if (Submarine.RectContains(useWorldCoordinates ? hull.WorldRect : hull.rect, position)) return hull;
}
return null;