(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -329,6 +329,10 @@ namespace Barotrauma
                        item.AiTarget?.Draw(spriteBatch);
                    }
                }
+                if (body != null)
+                {
+                    body.DebugDraw(spriteBatch, Color.White);
+                }
            }

            if (!editing || (body != null && !body.Enabled))
@@ -880,7 +884,6 @@ namespace Barotrauma
                        }
                    }
                    break;
-
                case NetEntityEvent.Type.InventoryState:
                    {
                        int containerIndex = msg.ReadRangedInteger(0, components.Count - 1);
@@ -969,6 +972,10 @@ namespace Barotrauma
                case NetEntityEvent.Type.ChangeProperty:
                    WritePropertyChange(msg, extraData, true);
                    break;
+                case NetEntityEvent.Type.Combine:
+                    UInt16 combineTargetID = (UInt16)extraData[1];
+                    msg.Write(combineTargetID);
+                    break;
            }
            msg.WritePadBits();
        }