Husk infections, manually attacking when controlling a creature

This commit is contained in:
Regalis
2016-08-26 20:52:44 +03:00
parent 3d2d06d2e5
commit e2885a912d
19 changed files with 586 additions and 84 deletions

View File

@@ -1623,7 +1623,7 @@ namespace Barotrauma.Networking
public void SendCharacterSpawnMessage(Character character, List<NetConnection> recipients = null)
{
if (recipients == null || !recipients.Any()) return;
if (recipients != null && !recipients.Any()) return;
NetOutgoingMessage message = server.CreateMessage();
message.Write((byte)PacketTypes.NewCharacter);

View File

@@ -340,15 +340,12 @@ namespace Barotrauma.Networking
{
if (gameStarted && Screen.Selected == GameMain.GameScreen)
{
chatMsgBox.Visible = Character.Controlled == null ||
(!Character.Controlled.IsUnconscious && Character.Controlled.Stun <= 0.0f);
chatMsgBox.Visible = Character.Controlled == null || Character.Controlled.CanSpeak;
inGameHUD.Update(deltaTime);
GameMain.GameSession.CrewManager.Update(deltaTime);
//if (crewFrameOpen) crewFrame.Update(deltaTime);
if (Character.Controlled == null || Character.Controlled.IsDead)
{
GameMain.GameScreen.Cam.TargetPos = Vector2.Zero;