Fixed missing kick/ban buttons in the crew menu

This commit is contained in:
Joonas Rikkonen
2017-07-26 17:49:55 +03:00
parent bcb0dbfa90
commit a627f25c95
4 changed files with 6 additions and 9 deletions
@@ -262,7 +262,7 @@ namespace Barotrauma
character.Info.CreateInfoFrame(previewPlayer); character.Info.CreateInfoFrame(previewPlayer);
if (GameMain.NetworkMember != null) GameMain.NetworkMember.SelectCrewCharacter(character, crewList); if (GameMain.NetworkMember != null) GameMain.NetworkMember.SelectCrewCharacter(character, previewPlayer);
return true; return true;
} }
@@ -1184,12 +1184,10 @@ namespace Barotrauma.Networking
} }
} }
public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame) public override bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
{ {
if (character == null) return false; if (character == null) return false;
var characterFrame = crewFrame.FindChild("selectedcharacter");
if (character != myCharacter) if (character != myCharacter)
{ {
var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character); var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character);
@@ -162,11 +162,10 @@ namespace Barotrauma.Networking
}; };
} }
public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame) public override bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
{ {
if (character == null) return false; if (character == null) return false;
var characterFrame = crewFrame.FindChild("selectedcharacter");
if (character != myCharacter) if (character != myCharacter)
{ {
var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, "", characterFrame); var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, "", characterFrame);
@@ -151,7 +151,7 @@ namespace Barotrauma.Networking
} }
} }
public virtual bool SelectCrewCharacter(Character character, GUIComponent crewFrame) public virtual bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
{ {
return false; return false;
} }