From fecb7bee9a50a8444f7c301ba9d823783a0d6c08 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Fri, 13 Jan 2017 17:53:40 +0200
Subject: [PATCH] Syncing attack input

---
 .../Source/Characters/AI/EnemyAIController.cs |  5 ++++
 Subsurface/Source/Characters/Character.cs     | 24 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index a614c921b..1b904e3a7 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -247,6 +247,11 @@ namespace Barotrauma
                     attackingLimb = limb;
                     break;   
                 }
+
+                if (Character.IsRemotePlayer)
+                {
+                    if (!Character.IsKeyDown(InputType.Attack)) return;
+                }
             }
             if (attackLimb != null)
             {
diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 7586d6c05..d3bda6ace 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -39,9 +39,9 @@ namespace Barotrauma
             Select = 0x40,
             Use = 0x80,
             Aim = 0x100,
-            //Attack = 0x200
+            Attack = 0x200,
 
-            MaxVal = 0x1FF
+            MaxVal = 0x3FF
         }
         private InputNetFlags dequeuedInput = 0;
         private InputNetFlags prevDequeuedInput = 0;
@@ -744,6 +744,8 @@ namespace Barotrauma
                         return dequeuedInput.HasFlag(InputNetFlags.Aim);
                     case InputType.Use:
                         return dequeuedInput.HasFlag(InputNetFlags.Use);
+                    case InputType.Attack:
+                        return dequeuedInput.HasFlag(InputNetFlags.Attack);
                 }
                 return false;
             }
@@ -1400,6 +1402,7 @@ namespace Barotrauma
                 if (IsKeyHit(InputType.Select))     newInput |= InputNetFlags.Select; //TODO: clean up the way this input is registered
                 if (IsKeyDown(InputType.Use))       newInput |= InputNetFlags.Use;
                 if (IsKeyDown(InputType.Aim))       newInput |= InputNetFlags.Aim;
+                if (IsKeyDown(InputType.Attack))    newInput |= InputNetFlags.Attack;
                     
                 if (AnimController.TargetDir == Direction.Left) newInput |= InputNetFlags.FacingLeft;
 
@@ -2132,23 +2135,33 @@ namespace Barotrauma
 
                     bool aiming = false;
                     bool use    = false;
+                    bool attack = false;
 
                     if (IsRemotePlayer)
                     {
                         aiming  = dequeuedInput.HasFlag(InputNetFlags.Aim);
                         use     = dequeuedInput.HasFlag(InputNetFlags.Use);
+
+                        attack  = dequeuedInput.HasFlag(InputNetFlags.Attack);
                     }
                     else
                     {
                         aiming  = keys[(int)InputType.Aim].GetHeldQueue;
                         use     = keys[(int)InputType.Use].GetHeldQueue;
 
+                        attack  = keys[(int)InputType.Attack].GetHeldQueue;
+
                         networkUpdateSent = true;
                     }
 
                     tempBuffer.Write(aiming);
                     tempBuffer.Write(use);
 
+                    if (AnimController.Limbs.Any(l => l != null && l.attack != null))
+                    {
+                        tempBuffer.Write(attack);
+                    }
+
                     if (selectedCharacter != null || selectedConstruction != null)
                     {
                         tempBuffer.Write(true);
@@ -2200,6 +2213,13 @@ namespace Barotrauma
                         keys[(int)InputType.Use].Held = useInput;
                         keys[(int)InputType.Use].SetState(false, useInput);
 
+                        if (AnimController.Limbs.Any(l => l != null && l.attack != null))
+                        {
+                            bool attackInput = msg.ReadBoolean();
+                            keys[(int)InputType.Attack].Held = attackInput;
+                            keys[(int)InputType.Attack].SetState(false, attackInput);
+                        }
+
                         bool entitySelected = msg.ReadBoolean();
                         if (entitySelected)
                         {