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

Renamed screens (EditMapScreen -> SubEditorScreen, EditCharacterScreen -> CharacterEditorScreen)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-11-18 15:13:03 +02:00
parent cda08b1745
commit 765587efd7
19 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
+4 -4
View File
@@ -83,7 +83,7 @@ namespace Barotrauma.Items.Components
0.3f);
}
if (!editing || !GameMain.EditMapScreen.WiringMode) return;
if (!editing || !GameMain.SubEditorScreen.WiringMode) return;
for (int i = 0; i < nodes.Count; i++)
{
@@ -127,7 +127,7 @@ namespace Barotrauma.Items.Components
if (draggingWire.connections[0] != null && draggingWire.connections[0].Item.Submarine != null) sub = draggingWire.connections[0].Item.Submarine;
if (draggingWire.connections[1] != null && draggingWire.connections[1].Item.Submarine != null) sub = draggingWire.connections[1].Item.Submarine;
Vector2 nodeWorldPos = GameMain.EditMapScreen.Cam.ScreenToWorld(PlayerInput.MousePosition) - sub.HiddenSubPosition - sub.Position;// Nodes[(int)selectedNodeIndex];
Vector2 nodeWorldPos = GameMain.SubEditorScreen.Cam.ScreenToWorld(PlayerInput.MousePosition) - sub.HiddenSubPosition - sub.Position;// Nodes[(int)selectedNodeIndex];
nodeWorldPos.X = MathUtils.Round(nodeWorldPos.X, Submarine.GridSize.X / 2.0f);
nodeWorldPos.Y = MathUtils.Round(nodeWorldPos.Y, Submarine.GridSize.Y / 2.0f);
@@ -150,7 +150,7 @@ namespace Barotrauma.Items.Components
if (selectedWire != null)
{
Vector2 mousePos = GameMain.EditMapScreen.Cam.ScreenToWorld(PlayerInput.MousePosition);
Vector2 mousePos = GameMain.SubEditorScreen.Cam.ScreenToWorld(PlayerInput.MousePosition);
if (selectedWire.item.Submarine != null) mousePos -= (selectedWire.item.Submarine.Position + selectedWire.item.Submarine.HiddenSubPosition);
//left click while holding ctrl -> check if the cursor is on a wire section,
@@ -199,7 +199,7 @@ namespace Barotrauma.Items.Components
float closestDist = 0.0f;
foreach (Wire w in wires)
{
Vector2 mousePos = GameMain.EditMapScreen.Cam.ScreenToWorld(PlayerInput.MousePosition);
Vector2 mousePos = GameMain.SubEditorScreen.Cam.ScreenToWorld(PlayerInput.MousePosition);
if (w.item.Submarine != null) mousePos -= (w.item.Submarine.Position + w.item.Submarine.HiddenSubPosition);
float dist = 0.0f;
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+3 -3
View File
@@ -118,12 +118,12 @@ namespace Barotrauma
{
if (editingHUD == null || editingHUD.UserData as Item != this)
{
editingHUD = CreateEditingHUD(Screen.Selected != GameMain.EditMapScreen);
editingHUD = CreateEditingHUD(Screen.Selected != GameMain.SubEditorScreen);
}
editingHUD.Update((float)Timing.Step);
if (Screen.Selected != GameMain.EditMapScreen) return;
if (Screen.Selected != GameMain.SubEditorScreen) return;
if (!prefab.IsLinkable) return;
@@ -257,7 +257,7 @@ namespace Barotrauma
public override void AddToGUIUpdateList()
{
if (Screen.Selected is EditMapScreen)
if (Screen.Selected is SubEditorScreen)
{
if (editingHUD != null) editingHUD.AddToGUIUpdateList();
}