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

v0.18.15.1

Browse Source
This commit is contained in:
Juan Pablo Arce
2022-08-09 13:37:15 -03:00
parent 2e2663a175
commit b17019db95
5 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs
+9 -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);
Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs
+3 -4
View File
@@ -121,10 +121,9 @@ namespace Barotrauma.Networking
{
client.VoipSound.SetRange(ChatMessage.SpeakRange * 0.4f, ChatMessage.SpeakRange);
}
if (messageType != ChatMessageType.Radio && Character.Controlled != null && !GameSettings.CurrentConfig.Audio.DisableVoiceChatFilters)
{
client.VoipSound.UseMuffleFilter = SoundPlayer.ShouldMuffleSound(Character.Controlled, client.Character.WorldPosition, ChatMessage.SpeakRange, client.Character.CurrentHull);
}
client.VoipSound.UseMuffleFilter =
messageType != ChatMessageType.Radio && Character.Controlled != null && !GameSettings.CurrentConfig.Audio.DisableVoiceChatFilters &&
SoundPlayer.ShouldMuffleSound(Character.Controlled, client.Character.WorldPosition, ChatMessage.SpeakRange, client.Character.CurrentHull);
}
GameMain.NetLobbyScreen?.SetPlayerSpeaking(client);
Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
+1 -1
View File
@@ -4801,7 +4801,7 @@ namespace Barotrauma
/// <summary>
/// GUI.MouseOn doesn't get updated while holding primary mouse and we need it to
/// </summary>
private bool IsMouseOnEditorGUI()
public bool IsMouseOnEditorGUI()
{
if (GUI.MouseOn == null) { return false; }
Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs
+9 -4
View File
@@ -700,9 +700,12 @@ namespace Barotrauma
List<MapEntity> prevSelected = MapEntity.SelectedList.ToList();
//reselect the entities that were selected during editing
//otherwise multi-editing won't work when we deselect the entities with unapplied changes in the textbox
foreach (var entity in editedEntities)
{
MapEntity.SelectedList.Add(entity);
if (editedEntities.Count > 1)
{
foreach (var entity in editedEntities)
{
MapEntity.SelectedList.Add(entity);
}
}
if (SetPropertyValue(property, entity, textBox.Text))
{
@@ -1448,7 +1451,9 @@ namespace Barotrauma
var component = otherComponents[componentIndex];
Debug.Assert(component.GetType() == parentObject.GetType());
SafeAdd(component, property);
if (value is string stringValue && Enum.TryParse(property.PropertyType, stringValue, out var enumValue))
if (value is string stringValue &&
property.PropertyType.IsEnum &&
Enum.TryParse(property.PropertyType, stringValue, out var enumValue))
{
property.PropertyInfo.SetValue(component, enumValue);
}