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

more accurate submarine body generation, multiplayer fixes, saving takes HiddenSubPosition into account, fire coordinate fixes, editscreen fixes, checking item triggers in AIObjectiveGoto, netlobbyscreen sync fixes, re-enabled level start/end positions, water edit fixed

Browse Source
This commit is contained in:
Regalis
2015-12-17 18:26:40 +02:00
parent 859be53d28
commit af470eab2e
53 changed files with 1065 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Subsurface/Source/Map/MapEntity.cs
View File

@@ -236,8 +236,6 @@ namespace Barotrauma
/// </summary>
public static void UpdateSelecting(Camera cam)
{
if (GUIComponent.MouseOn != null) return;
if (DisableSelect)
{
DisableSelect = false;
@@ -250,6 +248,10 @@ namespace Barotrauma
e.isSelected = false;
}
if (GUIComponent.MouseOn != null) return;
if (MapEntityPrefab.Selected != null)
{
selectionPos = Vector2.Zero;
@@ -278,8 +280,7 @@ namespace Barotrauma
e.isSelected = false;
}
if (highLightedEntity != null)
highLightedEntity.isHighlighted = true;
if (highLightedEntity != null) highLightedEntity.isHighlighted = true;
foreach (MapEntity e in selectedList)
{
@@ -304,7 +305,6 @@ namespace Barotrauma
startMovingPos = Vector2.Zero;
}
}
//started dragging a "selection rectangle"
else if (selectionPos != Vector2.Zero)
@@ -397,7 +397,7 @@ namespace Barotrauma
{
foreach (MapEntity e in selectedList)
GUI.DrawRectangle(spriteBatch,
new Vector2(e.rect.X, -e.rect.Y) + moveAmount,
new Vector2(e.WorldRect.X, -e.WorldRect.Y) + moveAmount,
new Vector2(e.rect.Width, e.rect.Height),
Color.DarkRed);
@@ -502,8 +502,7 @@ namespace Barotrauma
{
MapEntity linked = FindEntityByID(i) as MapEntity;
if (linked != null)
e.linkedTo.Add(linked);
if (linked != null) e.linkedTo.Add(linked);
}
}