Settings menu with sound and music volume sliders, re-enabled deselecting connectionpanels with E in editmapscreen
This commit is contained in:
@@ -105,7 +105,17 @@ namespace Barotrauma.Items.Components
|
||||
{
|
||||
if (stickTarget != null)
|
||||
{
|
||||
item.body.FarseerBody.RestoreCollisionWith(stickTarget);
|
||||
try
|
||||
{
|
||||
item.body.FarseerBody.RestoreCollisionWith(stickTarget);
|
||||
}
|
||||
catch
|
||||
{
|
||||
#if DEBUG
|
||||
DebugConsole.ThrowError("Failed to restore collision with stickTarget", e);
|
||||
#endif
|
||||
}
|
||||
|
||||
stickTarget = null;
|
||||
}
|
||||
GameMain.World.RemoveJoint(stickJoint);
|
||||
|
||||
@@ -37,7 +37,8 @@ namespace Barotrauma.Items.Components
|
||||
{
|
||||
if (character != Character.Controlled || character != user) return;
|
||||
|
||||
if (character.GetInputState(InputType.Select) &&
|
||||
if (Screen.Selected != GameMain.EditMapScreen &&
|
||||
character.GetInputState(InputType.Select) &&
|
||||
character.SelectedConstruction==this.item) character.SelectedConstruction = null;
|
||||
|
||||
Connection.DrawConnections(spriteBatch, this, character);
|
||||
|
||||
Reference in New Issue
Block a user