Fixed removed (e.g. eaten) characters not appearing in the round summary, but still spawning during the next round

This commit is contained in:
Joonas Rikkonen
2017-10-05 21:18:01 +03:00
parent a740bf9a56
commit 57667b3169
6 changed files with 30 additions and 21 deletions
@@ -72,7 +72,16 @@ namespace Barotrauma
private Item selectedConstruction;
private Item[] selectedItems;
public byte TeamID = 0;
private byte teamID;
public byte TeamID
{
get { return teamID; }
set
{
teamID = value;
if (info != null) info.TeamID = value;
}
}
public AnimController AnimController;
@@ -1706,6 +1715,7 @@ namespace Barotrauma
isDead = true;
this.causeOfDeath = causeOfDeath;
if (info != null) info.CauseOfDeath = causeOfDeath;
AnimController.movement = Vector2.Zero;
AnimController.TargetMovement = Vector2.Zero;
@@ -34,6 +34,10 @@ namespace Barotrauma
public bool StartItemsGiven;
public CauseOfDeath CauseOfDeath;
public byte TeamID;
public List<ushort> PickedItemIDs
{
get { return pickedItems; }
@@ -232,17 +232,6 @@ namespace Barotrauma
{
if (Mission != null) Mission.End();
if (GameMain.Server != null)
{
//CoroutineManager.StartCoroutine(GameMain.Server.EndGame(endMessage));
}
else if (GameMain.Client == null)
{
//Submarine.Unload();
GameMain.LobbyScreen.Select();
}
#if CLIENT
if (roundSummary != null)
{