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

Use MapCoordinates.Nullspace

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-01-20 22:26:28 +01:00
parent 2848da0b8e
commit 6537aead64
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/UserInterface/CharacterSetupGui.cs
View File

@@ -209,8 +209,7 @@ namespace Content.Client.UserInterface
ButtonGroup group, ButtonGroup group,
ICharacterProfile profile) ICharacterProfile profile)
{ {
_previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
new MapCoordinates(Vector2.Zero, MapId.Nullspace));
_previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile); _previewDummy.GetComponent<HumanoidAppearanceComponent>().UpdateFromProfile(profile);
var humanoid = profile as HumanoidCharacterProfile; var humanoid = profile as HumanoidCharacterProfile;
if (humanoid != null) if (humanoid != null)

6
Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
View File

@@ -29,8 +29,7 @@ namespace Content.Client.UserInterface
IClientPreferencesManager preferencesManager) IClientPreferencesManager preferencesManager)
{ {
_preferencesManager = preferencesManager; _preferencesManager = preferencesManager;
_previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", _previewDummy = entityManager.SpawnEntityAt("HumanMob_Dummy", MapCoordinates.Nullspace);
new MapCoordinates(Vector2.Zero, MapId.Nullspace));
var header = new NanoHeading var header = new NanoHeading
{ {
@@ -122,8 +121,7 @@ namespace Content.Client.UserInterface
foreach (var (slot, itemType) in gear.Equipment) foreach (var (slot, itemType) in gear.Equipment)
{ {
var item = entityMan var item = entityMan.SpawnEntityAt(itemType, MapCoordinates.Nullspace);
.SpawnEntityAt(itemType, new MapCoordinates(Vector2.Zero, MapId.Nullspace));
inventory.SetSlotVisuals(slot, item); inventory.SetSlotVisuals(slot, item);

12
Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
View File

@@ -36,13 +36,11 @@ namespace Content.IntegrationTests.Tests
var entityMan = IoCManager.Resolve<IEntityManager>(); var entityMan = IoCManager.Resolve<IEntityManager>();
var nullspace = new MapCoordinates(Vector2.Zero, MapId.Nullspace); human = entityMan.SpawnEntityAt("HumanMob_Content", MapCoordinates.Nullspace);
uniform = entityMan.SpawnEntityAt("JanitorUniform", MapCoordinates.Nullspace);
human = entityMan.SpawnEntityAt("HumanMob_Content", nullspace); idCard = entityMan.SpawnEntityAt("IDCardStandard", MapCoordinates.Nullspace);
uniform = entityMan.SpawnEntityAt("JanitorUniform", nullspace); pocketItem = entityMan.SpawnEntityAt("FlashlightLantern", MapCoordinates.Nullspace);
idCard = entityMan.SpawnEntityAt("IDCardStandard", nullspace); var tooBigItem = entityMan.SpawnEntityAt("RedToolboxItem", MapCoordinates.Nullspace);
pocketItem = entityMan.SpawnEntityAt("FlashlightLantern", nullspace);
var tooBigItem = entityMan.SpawnEntityAt("RedToolboxItem", nullspace);
inventory = human.GetComponent<InventoryComponent>(); inventory = human.GetComponent<InventoryComponent>();