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

Selecting an item with no ItemContainer component doesn't prevent equipping/unequipping items by double clicking, added missing "gamescreen" console command

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-13 23:33:53 +03:00
parent cc9ebe9fc2
commit d5aa1d8b97
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/DebugConsole.cs
+1 -1
View File
@@ -206,7 +206,7 @@ namespace Barotrauma
commands.Add(new Command("gamescreen|game", "gamescreen/game: Go to the \"in-game\" view.", (string[] args) => commands.Add(new Command("gamescreen|game", "gamescreen/game: Go to the \"in-game\" view.", (string[] args) =>
{ {
GameMain.GameScreen.Select();
})); }));
commands.Add(new Command("editsubscreen|editsub|subeditor", "editsub/subeditor: Switch to the submarine editor.", (string[] args) => commands.Add(new Command("editsubscreen|editsub|subeditor", "editsub/subeditor: Switch to the submarine editor.", (string[] args) =>
Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs
+3 -6
View File
@@ -251,13 +251,10 @@ namespace Barotrauma
} }
else else
{ {
if (character.SelectedConstruction != null) var selectedContainer = character.SelectedConstruction?.GetComponent<ItemContainer>();
if (selectedContainer != null && selectedContainer.Inventory != null)
{ {
var selectedContainer = character.SelectedConstruction.GetComponent<ItemContainer>(); selectedContainer.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots, true);
if (selectedContainer != null && selectedContainer.Inventory != null)
{
selectedContainer.Inventory.TryPutItem(doubleClickedItem, doubleClickedItem.AllowedSlots, true);
}
} }
else if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory != null) else if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory != null)
{ {