tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a fatal error when opening the PA control computer interface. (#3478)

Browse Source 
* Fixes a fatal crash when opening the PA control computer interface.

* Fix to make PA emitters work.

* Turned _pos and _afterUnderscore into local variables.

* Explicit states

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
WlarusFromDaSpace
2021-03-04 10:38:43 +02:00
committed by GitHub
parent cbe354b263
commit 952a8e709a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
View File

@@ -259,17 +259,17 @@ namespace Content.Client.ParticleAccelerator
Children = Children =
{ {
new Control {MinSize = imgSize}, new Control {MinSize = imgSize},
(_endCapTexture = Segment("end_cap")), (_endCapTexture = Segment("end_cap", "capc")),
new Control {MinSize = imgSize}, new Control {MinSize = imgSize},
(_controlBoxTexture = Segment("control_box")), (_controlBoxTexture = Segment("control_box", "boxc")),
(_fuelChamberTexture = Segment("fuel_chamber")), (_fuelChamberTexture = Segment("fuel_chamber", "chamberc")),
new Control {MinSize = imgSize}, new Control {MinSize = imgSize},
new Control {MinSize = imgSize}, new Control {MinSize = imgSize},
(_powerBoxTexture = Segment("power_box")), (_powerBoxTexture = Segment("power_box", "boxc")),
new Control {MinSize = imgSize}, new Control {MinSize = imgSize},
(_emitterLeftTexture = Segment("emitter_left")), (_emitterLeftTexture = Segment("emitter_left", "leftc")),
(_emitterCenterTexture = Segment("emitter_center")), (_emitterCenterTexture = Segment("emitter_center", "centerc")),
(_emitterRightTexture = Segment("emitter_right")), (_emitterRightTexture = Segment("emitter_right", "rightc")),
} }
} }
} }
@@ -325,9 +325,9 @@ namespace Content.Client.ParticleAccelerator
} }
}; };
PASegmentControl Segment(string name) PASegmentControl Segment(string name, string state)
{ {
return new(this, resourceCache, name); return new(this, resourceCache, name, state);
} }
} }
@@ -461,13 +461,13 @@ namespace Content.Client.ParticleAccelerator
private readonly TextureRect _unlit; private readonly TextureRect _unlit;
private readonly RSI _rsi; private readonly RSI _rsi;
public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name) public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name, string state)
{ {
_menu = menu; _menu = menu;
_baseState = name; _baseState = name;
_rsi = cache.GetResource<RSIResource>($"/Textures/Constructible/Power/PA/{name}.rsi").RSI; _rsi = cache.GetResource<RSIResource>($"/Textures/Constructible/Specific/Engines/PA/{name}.rsi").RSI;
AddChild(_base = new TextureRect {Texture = _rsi[$"{name}c"].Frame0}); AddChild(_base = new TextureRect {Texture = _rsi[$"{state}"].Frame0});
AddChild(_unlit = new TextureRect()); AddChild(_unlit = new TextureRect());
MinSize = _rsi.Size; MinSize = _rsi.Size;
} }