From 8e8b8464af9299bc88f0a97125c22645b13ba7ab Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 6 Mar 2018 13:55:30 +0200 Subject: [PATCH] All items and structures have to define a sourcerect for the sprite because otherwise the dedicated server won't know the size of the entity. Closes #321 --- .../Content/Items/Artifacts/artifacts.xml | 5 ++--- .../Content/Items/Containers/containers.xml | 2 +- .../BarotraumaShared/Content/Items/Diving/divinggear.xml | 4 ++-- .../Content/Items/Electricity/monitors.xml | 5 ++--- .../Content/Items/Electricity/poweritems.xml | 5 ++--- .../Content/Items/Jobgear/captaingear.xml | 2 +- .../BarotraumaShared/Content/Items/Jobgear/misc.xml | 6 +++--- .../BarotraumaShared/Content/Items/Ladder/ladder.xml | 7 +++---- .../Content/Items/OxygenGenerator/oxygengenerator.xml | 7 +++---- Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml | 8 +++----- .../BarotraumaShared/Content/Items/Reactor/reactor.xml | 4 ++-- .../BarotraumaShared/Content/Items/Weapons/railgun.xml | 5 ++--- Barotrauma/BarotraumaShared/Content/Items/idcard.xml | 2 +- Barotrauma/BarotraumaShared/Content/Items/itemlabel.xml | 2 +- Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs | 4 ++++ Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs | 4 ++++ 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml index e2b514805..c84692683 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml @@ -263,10 +263,9 @@ name="Artifact Holder" linkable="true" category="Alien" - Tags="alien" - > + Tags="alien"> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml index 90cd64399..0025f3810 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml @@ -4,7 +4,7 @@ linkable="true" pickdistance ="150"> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml index 761b2a71b..0a688864f 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml @@ -35,7 +35,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Electricity/monitors.xml b/Barotrauma/BarotraumaShared/Content/Items/Electricity/monitors.xml index 251937672..780f08b61 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Electricity/monitors.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Electricity/monitors.xml @@ -1,10 +1,9 @@  + linkable="true"> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml b/Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml index 81c2188f4..5750f3dab 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Electricity/poweritems.xml @@ -69,11 +69,10 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml index 44532a7e7..ac38100bf 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml @@ -6,7 +6,7 @@ cargocontainername="Metal Crate" description="A token of the Captain's unquestionable authority."> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml index 41c418c2c..a40911349 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml @@ -7,7 +7,7 @@ cargocontainername="Metal Crate" price="10"> - + @@ -33,7 +33,7 @@ tags="smallitem" description="Praise the honkmother."> - + @@ -54,7 +54,7 @@ tags="smallitem" description="Praise the honkmother."> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Ladder/ladder.xml b/Barotrauma/BarotraumaShared/Content/Items/Ladder/ladder.xml index e33ff2387..99a1bc3fe 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Ladder/ladder.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Ladder/ladder.xml @@ -2,10 +2,9 @@ name="Ladder" resizevertical="true"> + - + - - - + \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml index 77ee846ef..ac9a8c006 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml @@ -3,9 +3,8 @@ name="Oxygen Generator" category="Machine" linkable="true"> - - - + + @@ -29,7 +28,7 @@ category="Machine" linkable="true"> - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml b/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml index 491974dec..54890018e 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Pump/pump.xml @@ -2,10 +2,9 @@ + category="Machine"> - + @@ -25,8 +24,7 @@ + category="Machine"> diff --git a/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml b/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml index 57d069285..a5a2122bc 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml @@ -68,7 +68,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml index 0187f12e3..07f406431 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml @@ -4,10 +4,9 @@ category="Machine" focusonselected="true" offsetonselected="700" - linkable="true" - > + linkable="true"> - + - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/itemlabel.xml b/Barotrauma/BarotraumaShared/Content/Items/itemlabel.xml index 56e4fcc9f..bc1f14115 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/itemlabel.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/itemlabel.xml @@ -5,7 +5,7 @@ resizehorizontal="true" resizevertical="true"> - + diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs index 41def44fd..856cee705 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs @@ -308,6 +308,10 @@ namespace Barotrauma canSpriteFlipX = subElement.GetAttributeBool("canflipx", true); sprite = new Sprite(subElement, spriteFolder); + if (subElement.Attribute("sourcerect") == null) + { + DebugConsole.ThrowError("Warning - sprite sourcerect not configured for item \"" + Name + "\"!"); + } size = sprite.size; break; #if CLIENT diff --git a/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs b/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs index cdd954390..89b815e83 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs @@ -99,6 +99,10 @@ namespace Barotrauma { case "sprite": sp.sprite = new Sprite(subElement); + if (subElement.Attribute("sourcerect") == null) + { + DebugConsole.ThrowError("Warning - sprite sourcerect not configured for structure \"" + sp.name + "\"!"); + } if (subElement.GetAttributeBool("fliphorizontal", false)) sp.sprite.effects = SpriteEffects.FlipHorizontally;