From 35ee8dc883d87eb6fce1410ed88b223511d341f6 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Mon, 8 Apr 2019 16:00:08 +0300 Subject: [PATCH] (e1516fabb) Don't allow selecting railgun shell or depthcharge ItemContainers (can only be accessed when the item is in the inventory). Fixes characters getting locked to looking towards the shell/charge they're holding. --- .../Source/GameSession/CrewManager.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index 8e6d17d51..1a7eaf05b 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -271,6 +271,7 @@ namespace Barotrauma DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace); return; } + } characterInfos.Add(characterInfo); } @@ -598,20 +599,7 @@ namespace Barotrauma characterListBox.BarScroll = roundedPos; } - #region Dialog - /// - /// Adds the message to the single player chatbox. - /// - public void AddSinglePlayerChatMessage(string senderName, string text, ChatMessageType messageType, Character sender) - { - if (!isSinglePlayer) - { - DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace); - return; - } - if (string.IsNullOrEmpty(text)) { return; } - - chatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender)); + return radioItem.GetComponent(); } private IEnumerable KillCharacterAnim(GUIComponent component)