- fixed clients failing to load submarines if they're not in the root Submarine folder

- some refactoring
- temporarily disabled kicking by voting
This commit is contained in:
Regalis
2016-05-30 18:32:36 +03:00
parent 9b659f72d6
commit b512a7ec18
6 changed files with 111 additions and 72 deletions

View File

@@ -51,7 +51,7 @@ namespace Barotrauma.Networking
Kick
}
class NetworkMember
abstract class NetworkMember
{
protected NetPeer netPeer;
@@ -62,8 +62,7 @@ namespace Barotrauma.Networking
protected GUIFrame inGameHUD;
protected GUIListBox chatBox;
protected GUITextBox chatMsgBox;
protected GUITextBox chatMsgBox;
public int EndVoteCount, EndVoteMax;
//private GUITextBlock endVoteText;
@@ -108,7 +107,13 @@ namespace Barotrauma.Networking
{
get { return inGameHUD; }
}
public virtual List<Client> ConnectedClients
{
get { return null; }
}
public NetworkMember()
{
inGameHUD = new GUIFrame(new Rectangle(0,0,0,0), null, null);