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

Fixed incorrectly positioned character info boxes in the info menu

Browse Source
This commit is contained in:
Regalis
2017-04-24 19:08:25 +03:00
parent 645df3fde6
commit df7daa5925
4 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Subsurface/Source/Networking/GameClient.cs
View File

@@ -910,13 +910,12 @@ namespace Barotrauma.Networking
}
public override bool SelectCrewCharacter(GUIComponent component, object obj)
public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
{
var characterFrame = component.Parent.Parent.FindChild("selectedcharacter");
Character character = obj as Character;
if (character == null) return false;
var characterFrame = crewFrame.FindChild("selectedcharacter");
if (character != myCharacter)
{
var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character);

8
Subsurface/Source/Networking/GameServer.cs
View File

@@ -1544,15 +1544,11 @@ namespace Barotrauma.Networking
SaveClientPermissions();
}
public override bool SelectCrewCharacter(GUIComponent component, object obj)
public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
{
base.SelectCrewCharacter(component, obj);
var characterFrame = component.Parent.Parent.FindChild("selectedcharacter");
Character character = obj as Character;
if (character == null) return false;
var characterFrame = crewFrame.FindChild("selectedcharacter");
if (character != myCharacter)
{
var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, "", characterFrame);

2
Subsurface/Source/Networking/NetworkMember.cs
View File

@@ -427,7 +427,7 @@ namespace Barotrauma.Networking
}
}
public virtual bool SelectCrewCharacter(GUIComponent component, object obj)
public virtual bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
{
return false;
}