Changed entity ids from int to ushort, inventory sync bugfixes

Subsurface/Source/Characters/AI/EnemyAIController.cs

@@ -534,7 +534,7 @@ namespace Barotrauma
             //message.WriteRangedSingle(MathHelper.Clamp(raycastTimer, 0.0f, RaycastInterval), 0.0f, RaycastInterval, 8);
             //message.WriteRangedSingle(MathHelper.Clamp(coolDownTimer, 0.0f, attackCoolDown * 2.0f), 0.0f, attackCoolDown * 2.0f, 8);
 
-            message.Write(targetEntity==null ? -1 : (targetEntity as Entity).ID);
+            message.Write(targetEntity==null ? (ushort)0 : (targetEntity as Entity).ID);
         }
 
         public override void ReadNetworkData(NetIncomingMessage message)
@@ -548,7 +548,7 @@ namespace Barotrauma
 
             Vector2 targetPosition = Vector2.Zero;
 
-            int targetID;
+            ushort targetID;
 
             try
             {
@@ -571,7 +571,7 @@ namespace Barotrauma
                 //raycastTimer = message.ReadRangedSingle(0.0f, RaycastInterval, 8);
                 //coolDownTimer = message.ReadRangedSingle(0.0f, attackCoolDown*2.0f, 8);
 
-                targetID = message.ReadInt32();
+                targetID = message.ReadUInt16();
             }
 
             catch { return; }
@@ -583,8 +583,7 @@ namespace Barotrauma
             //this.raycastTimer = raycastTimer;
             //this.coolDownTimer = coolDownTimer;
 
-            if (targetID > -1)
-                targetEntity = Entity.FindEntityByID(targetID) as IDamageable;            
+            if (targetID > 0) targetEntity = Entity.FindEntityByID(targetID) as IDamageable;            
             
         }
     }

Subsurface/Source/Characters/CharacterInfo.cs

@@ -17,7 +17,7 @@ namespace Barotrauma
         
         public Job Job;
 
-        private List<int> pickedItems;
+        private List<ushort> pickedItems;
 
         private Vector2[] headSpriteRange;
 
@@ -30,7 +30,7 @@ namespace Barotrauma
 
         public bool StartItemsGiven;
 
-        public List<int> PickedItemIDs
+        public List<ushort> PickedItemIDs
         {
             get { return pickedItems; }
         }
@@ -72,7 +72,7 @@ namespace Barotrauma
 
             headSpriteRange = new Vector2[2];
 
-            pickedItems = new List<int>();
+            pickedItems = new List<ushort>();
 
             //ID = -1;
 
@@ -218,7 +218,7 @@ namespace Barotrauma
             HeadSpriteId    = ToolBox.GetAttributeInt(element, "headspriteid", 1);
             StartItemsGiven = ToolBox.GetAttributeBool(element, "startitemsgiven", false);
 
-            pickedItems = new List<int>();
+            pickedItems = new List<ushort>();
 
             string pickedItemString = ToolBox.GetAttributeString(element, "items", "");
             if (!string.IsNullOrEmpty(pickedItemString))
@@ -226,7 +226,7 @@ namespace Barotrauma
                 string[] itemIds = pickedItemString.Split(',');
                 foreach (string s in itemIds)
                 {
-                    pickedItems.Add(int.Parse(s));
+                    pickedItems.Add((ushort)int.Parse(s));
                 }
             }
 

Subsurface/Source/Characters/Ragdoll.cs

@@ -685,11 +685,14 @@ namespace Barotrauma
                         //limb.body.SetTransform(limb.SimPosition + newMovement * 0.1f, limb.Rotation);
                     }
 
-                    correctionMovement = Vector2.Normalize(newMovement) * MathHelper.Clamp(dist*5.0f, 0.1f, 5.0f);
+                    correctionMovement =
+                        Vector2.Lerp(targetMovement, Vector2.Normalize(newMovement) * MathHelper.Clamp(dist * 5.0f, 0.1f, 5.0f), 0.2f);
                 }
                 else
                 {
-                    correctionMovement = Vector2.Normalize(newMovement) * MathHelper.Clamp(dist * 5.0f, 0.1f, 5.0f);
+                    correctionMovement =
+                        Vector2.Lerp(targetMovement, Vector2.Normalize(newMovement) * MathHelper.Clamp(dist * 5.0f, 0.1f, 5.0f), 0.2f);
+                        
                     if (Math.Abs(correctionMovement.Y) < 0.1f) correctionMovement.Y = 0.0f;
                 }
             }