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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Source/GUI/GUIButton.cs
	Subsurface/Source/GameSession/CrewManager.cs
	Subsurface/Source/GameSession/GameSession.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Screens/MainMenuScreen.cs
	Subsurface/Source/Screens/ServerListScreen.cs
This commit is contained in:
Regalis
2017-04-24 19:10:51 +03:00
parent 31f7eca717 df7daa5925
commit 3e5f8a43a0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/GameSession/CrewManager.cs
+2
View File
@@ -250,6 +250,8 @@ namespace Barotrauma
protected virtual bool SelectCrewCharacter(Character character, GUIComponent crewList) protected virtual bool SelectCrewCharacter(Character character, GUIComponent crewList)
{ {
if (character == null) return false;
GUIComponent existingFrame = crewList.Parent.FindChild("selectedcharacter"); GUIComponent existingFrame = crewList.Parent.FindChild("selectedcharacter");
if (existingFrame != null) crewList.Parent.RemoveChild(existingFrame); if (existingFrame != null) crewList.Parent.RemoveChild(existingFrame);
Subsurface/Source/Networking/GameClient.cs
+1 -1
View File
@@ -1147,7 +1147,7 @@ namespace Barotrauma.Networking
client.Shutdown(""); client.Shutdown("");
GameMain.NetworkMember = null; GameMain.NetworkMember = null;
} }
public void WriteCharacterInfo(NetOutgoingMessage msg) public void WriteCharacterInfo(NetOutgoingMessage msg)
{ {
if (characterInfo == null) return; if (characterInfo == null) return;