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

(221f9f2a6) Merge branch 'dev' into capitalizationfixes

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-04 15:38:31 +03:00
parent f797235bfd
commit e592c49fa8
22 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
+10 -3
View File
@@ -505,7 +505,10 @@ namespace Barotrauma
btn.OnClicked += (GUIButton button, object userData) =>
{
if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false;
#if CLIENT
if (GameMain.Client != null && Character.Controlled == null) { return false; }
#endif
if (Character.Controlled != null && Character.Controlled.SpeechImpediment >= 100.0f) { return false; }
if (btn.GetChildByUserData("selected").Visible)
{
@@ -919,7 +922,9 @@ namespace Barotrauma
Font = GUI.SmallFont,
OnClicked = (btn, userData) =>
{
if (Character.Controlled == null) return false;
#if CLIENT
if (GameMain.Client != null && Character.Controlled == null) { return false; }
#endif
SetCharacterOrder(character, userData as Order, option, Character.Controlled);
orderTargetFrame = null;
OrderOptionButtons.Clear();
@@ -957,7 +962,9 @@ namespace Barotrauma
UserData = item == null ? order : new Order(order, item, item.Components.FirstOrDefault(ic => ic.GetType() == order.ItemComponentType)),
OnClicked = (btn, userData) =>
{
if (Character.Controlled == null) return false;
#if CLIENT
if (GameMain.Client != null && Character.Controlled == null) { return false; }
#endif
SetCharacterOrder(character, userData as Order, option, Character.Controlled);
orderTargetFrame = null;
OrderOptionButtons.Clear();