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

Rider reports these things as error for some reason so I'm just gonna uhhhh

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-03-04 22:59:53 +01:00
parent 4a466f4927
commit c8a7f41331
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
View File

@@ -32,10 +32,10 @@ namespace Content.Client.Storage.Visualizers
if (_openIcon != null && if (_openIcon != null &&
entities.TryGetComponent<SpriteComponent?>(entity, out var spriteComponent) && entities.TryGetComponent<SpriteComponent?>(entity, out var spriteComponent) &&
spriteComponent.BaseRSI?.Path != null) spriteComponent.BaseRSI?.Path is { } path)
{ {
spriteComponent.LayerMapReserveBlank(OpenIcon); spriteComponent.LayerMapReserveBlank(OpenIcon);
spriteComponent.LayerSetSprite(OpenIcon, new Rsi(spriteComponent.BaseRSI.Path, _openIcon)); spriteComponent.LayerSetSprite(OpenIcon, new Rsi(path, _openIcon));
spriteComponent.LayerSetVisible(OpenIcon, false); spriteComponent.LayerSetVisible(OpenIcon, false);
} }
} }

4
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -67,12 +67,12 @@ namespace Content.Client.Weapons.Melee
if (EntityManager.EntityExists(msg.Source) && if (EntityManager.EntityExists(msg.Source) &&
msg.TextureEffect && msg.TextureEffect &&
EntityManager.TryGetComponent(msg.Source, out ISpriteComponent? sourceSprite) && EntityManager.TryGetComponent(msg.Source, out ISpriteComponent? sourceSprite) &&
sourceSprite.BaseRSI?.Path != null) sourceSprite.BaseRSI?.Path is { } path)
{ {
var curTime = _gameTiming.CurTime; var curTime = _gameTiming.CurTime;
var effect = new EffectSystemMessage var effect = new EffectSystemMessage
{ {
EffectSprite = sourceSprite.BaseRSI.Path.ToString(), EffectSprite = path.ToString(),
RsiState = sourceSprite.LayerGetState(0).Name, RsiState = sourceSprite.LayerGetState(0).Name,
Coordinates = EntityManager.GetComponent<TransformComponent>(attacker).Coordinates, Coordinates = EntityManager.GetComponent<TransformComponent>(attacker).Coordinates,
Color = Vector4.Multiply(new Vector4(255, 255, 255, 125), 1.0f), Color = Vector4.Multiply(new Vector4(255, 255, 255, 125), 1.0f),