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

Firesource syncing fixes

Browse Source
This commit is contained in:
Regalis
2017-04-03 20:22:59 +03:00
parent 43d29de45c
commit e75d596d34
1 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Map/Hull.cs
+23 -35
View File
@@ -837,9 +837,9 @@ namespace Barotrauma
(fireSource.Position.X - rect.X) / rect.Width, (fireSource.Position.X - rect.X) / rect.Width,
(fireSource.Position.Y - (rect.Y - rect.Height)) / rect.Height); (fireSource.Position.Y - (rect.Y - rect.Height)) / rect.Height);
message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.X, 0.0f, 1.0f), 0.0f, 1.0f, 4); message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.X, 0.0f, 1.0f), 0.0f, 1.0f, 8);
message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.Y, 0.0f, 1.0f), 0.0f, 1.0f, 4); message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.Y, 0.0f, 1.0f), 0.0f, 1.0f, 8);
message.WriteRangedSingle(MathHelper.Clamp(fireSource.Size.X / rect.Width, 0.0f, 1.0f), 0, 1.0f, 6); message.WriteRangedSingle(MathHelper.Clamp(fireSource.Size.X / rect.Width, 0.0f, 1.0f), 0, 1.0f, 8);
} }
} }
@@ -853,53 +853,41 @@ namespace Barotrauma
OxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8); OxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8);
bool hasFireSources = message.ReadBoolean(); bool hasFireSources = message.ReadBoolean();
int fireSourceCount = 0;
List<FireSource> newFireSources = new List<FireSource>();
if (hasFireSources) if (hasFireSources)
{ {
int fireSourceCount = message.ReadRangedInteger(0, 16); fireSourceCount = message.ReadRangedInteger(0, 16);
for (int i = 0; i < fireSourceCount; i++) for (int i = 0; i < fireSourceCount; i++)
{ {
Vector2 pos = Vector2.Zero; Vector2 pos = Vector2.Zero;
float size = 0.0f; float size = 0.0f;
pos.X = MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 4), 0.05f, 0.95f); pos.X = MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f);
pos.Y = MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 4), 0.05f, 0.95f); pos.Y = MathHelper.Clamp(message.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f);
size = message.ReadRangedSingle(0.0f, 1.0f, 6); size = message.ReadRangedSingle(0.0f, 1.0f, 8);
pos = new Vector2( pos = new Vector2(
rect.X + rect.Width * pos.X, rect.X + rect.Width * pos.X,
rect.Y - rect.Height + (rect.Height * pos.Y)); rect.Y - rect.Height + (rect.Height * pos.Y));
size = size * rect.Width;
var newFire = i < fireSources.Count ? fireSources[i] : new FireSource(pos + Submarine.Position, null, true);
newFire.Position = pos;
newFire.Size = new Vector2(size, newFire.Size.Y);
var existingFire = fireSources.Find(fs => fs.Contains(pos)); //ignore if the fire wasn't added to this room (invalid position)?
if (existingFire != null) if (!fireSources.Contains(newFire))
{ {
newFireSources.Add(existingFire); newFire.Remove();
existingFire.Position = pos; continue;
existingFire.Size = new Vector2( }
existingFire.Hull == null ? size : size * existingFire.Hull.rect.Width,
existingFire.Size.Y);
}
else
{
var newFire = new FireSource(pos + Submarine.Position, null, true);
newFire.Size = new Vector2(
newFire.Hull == null ? size : size * newFire.Hull.rect.Width,
newFire.Size.Y);
//ignore if the fire wasn't added to this room (invalid position)?
if (!fireSources.Contains(newFire))
{
newFire.Remove();
continue;
}
newFireSources.Add(newFire);
}
} }
} }
var toBeRemoved = fireSources.FindAll(fs => !newFireSources.Contains(fs)); while (fireSources.Count > fireSourceCount)
toBeRemoved.ForEach(tbr => tbr.Remove()); {
fireSources[fireSources.Count - 1].Remove();
fireSources = newFireSources; }
} }
public override XElement Save(XElement parentElement) public override XElement Save(XElement parentElement)