vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed null exception when copypasting entities that can't be linked (e.g. walls), aligning pasted entities to the "world grid"

Browse Source
This commit is contained in:
Regalis
2016-11-28 16:14:50 +02:00
parent 12f98268b5
commit 5779de0e17
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Map/MapEntity.cs
+5 -2
View File
@@ -243,6 +243,7 @@ namespace Barotrauma
//clone links between the entities //clone links between the entities
for (int i = 0; i < clones.Count; i++) for (int i = 0; i < clones.Count; i++)
{ {
if (entitiesToClone[i].linkedTo == null) continue;
foreach (MapEntity linked in entitiesToClone[i].linkedTo) foreach (MapEntity linked in entitiesToClone[i].linkedTo)
{ {
if (!entitiesToClone.Contains(linked)) continue; if (!entitiesToClone.Contains(linked)) continue;
@@ -429,10 +430,12 @@ namespace Barotrauma
Vector2 center = Vector2.Zero; Vector2 center = Vector2.Zero;
clones.ForEach(c => center += c.WorldPosition); clones.ForEach(c => center += c.WorldPosition);
center /= clones.Count; center = Submarine.VectorToWorldGrid(center / clones.Count);
Vector2 moveAmount = Submarine.VectorToWorldGrid(cam.WorldViewCenter - center);
selectedList = new List<MapEntity>(clones); selectedList = new List<MapEntity>(clones);
selectedList.ForEach(c => c.Move(cam.WorldViewCenter - center)); selectedList.ForEach(c => c.Move(moveAmount));
} }
} }