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

The SubFloorHideComponent can now be properly started/stopped. Previously this did nothing.

Browse Source
This commit is contained in:
Acruid
2019-09-19 11:43:46 -07:00
parent 35e88ea62c
commit cbea6bf41f
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.GameObjects.Components;
using Content.Client.GameObjects.Components;
using Content.Shared.Maps;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects.Components.Transform;
@@ -39,12 +39,9 @@ namespace Content.Client.GameObjects.EntitySystems
return;
}
var sprite = senderEnt.GetComponent<ISpriteComponent>();
var grid = _mapManager.GetGrid(senderEnt.Transform.GridID);
var position = senderEnt.Transform.GridPosition;
var tileRef = grid.GetTileRef(position);
var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileRef.Tile.TypeId];
sprite.Visible = tileDef.IsSubFloor;
var indices = grid.WorldToTile(senderEnt.Transform.WorldPosition);
UpdateTile(grid, indices);
}
private void MapManagerOnTileChanged(object sender, TileChangedEventArgs e)
@@ -67,13 +64,13 @@ namespace Content.Client.GameObjects.EntitySystems
foreach (var snapGridComponent in grid.GetSnapGridCell(position, SnapGridOffset.Center))
{
var entity = snapGridComponent.Owner;
if (!entity.HasComponent<SubFloorHideComponent>() ||
if (!entity.TryGetComponent(out SubFloorHideComponent subFloorComponent) ||
!entity.TryGetComponent(out ISpriteComponent spriteComponent))
{
continue;
}
spriteComponent.Visible = tileDef.IsSubFloor;
spriteComponent.Visible = !subFloorComponent.Running || tileDef.IsSubFloor;
}
}
}