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

v0.19.0.0 (unstable)

Browse Source
This commit is contained in:
Regalis11
2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs
+13 -5
View File
@@ -232,8 +232,7 @@ namespace Barotrauma
{
foreach (MapEntity e in mapEntityList)
{
if (!e.SelectableInEditor) continue;
if (!e.SelectableInEditor) { continue; }
if (e.IsMouseOn(position))
{
int i = 0;
@@ -243,9 +242,7 @@ namespace Barotrauma
{
i++;
}
highlightedEntities.Insert(i, e);
if (i == 0) highLightedEntity = e;
}
}
@@ -741,7 +738,14 @@ namespace Barotrauma
/// </summary>
public static void DrawSelecting(SpriteBatch spriteBatch, Camera cam)
{
if (GUI.MouseOn != null) return;
if (Screen.Selected is SubEditorScreen subEditor)
{
if (subEditor.IsMouseOnEditorGUI()) { return; }
}
else if (GUI.MouseOn != null)
{
return;
}
Vector2 position = PlayerInput.MousePosition;
position = cam.ScreenToWorld(position);
@@ -1093,6 +1097,10 @@ namespace Barotrauma
resizeDirY = y;
resizing = true;
startMovingPos = Vector2.Zero;
foreach (var mapEntity in mapEntityList)
{
if (mapEntity != this) { mapEntity.isHighlighted = false; }
}
}
}
}