Update submodule, entity spawn rewrite.
This commit is contained in:
@@ -9,6 +9,7 @@ using Robust.Shared.Input;
|
|||||||
using Robust.Shared.Interfaces.Configuration;
|
using Robust.Shared.Interfaces.Configuration;
|
||||||
using Robust.Shared.Interfaces.Map;
|
using Robust.Shared.Interfaces.Map;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
|
using Robust.Shared.Localization;
|
||||||
using Robust.Shared.Players;
|
using Robust.Shared.Players;
|
||||||
using Robust.Shared.Prototypes;
|
using Robust.Shared.Prototypes;
|
||||||
|
|
||||||
@@ -26,6 +27,7 @@ namespace Content.Client
|
|||||||
[Dependency] private readonly IStateManager _stateManager;
|
[Dependency] private readonly IStateManager _stateManager;
|
||||||
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
|
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
|
||||||
[Dependency] private readonly IGameHud _gameHud;
|
[Dependency] private readonly IGameHud _gameHud;
|
||||||
|
[Dependency] private readonly ILocalizationManager _localizationManager;
|
||||||
#pragma warning restore 649
|
#pragma warning restore 649
|
||||||
|
|
||||||
private EscapeMenu _escapeMenu;
|
private EscapeMenu _escapeMenu;
|
||||||
@@ -43,7 +45,7 @@ namespace Content.Client
|
|||||||
{
|
{
|
||||||
// Switched TO GameScreen.
|
// Switched TO GameScreen.
|
||||||
_escapeMenu = new EscapeMenu(_clientConsole, _tileDefinitionManager, _placementManager,
|
_escapeMenu = new EscapeMenu(_clientConsole, _tileDefinitionManager, _placementManager,
|
||||||
_prototypeManager, _resourceCache, _configurationManager)
|
_prototypeManager, _resourceCache, _configurationManager, _localizationManager)
|
||||||
{
|
{
|
||||||
Visible = false
|
Visible = false
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using Robust.Client.UserInterface.Controls;
|
|||||||
using Robust.Client.UserInterface.CustomControls;
|
using Robust.Client.UserInterface.CustomControls;
|
||||||
using Robust.Shared.Interfaces.Configuration;
|
using Robust.Shared.Interfaces.Configuration;
|
||||||
using Robust.Shared.Interfaces.Map;
|
using Robust.Shared.Interfaces.Map;
|
||||||
|
using Robust.Shared.Localization;
|
||||||
using Robust.Shared.Prototypes;
|
using Robust.Shared.Prototypes;
|
||||||
|
|
||||||
namespace Content.Client.UserInterface
|
namespace Content.Client.UserInterface
|
||||||
@@ -19,6 +20,7 @@ namespace Content.Client.UserInterface
|
|||||||
private readonly IPrototypeManager _prototypeManager;
|
private readonly IPrototypeManager _prototypeManager;
|
||||||
private readonly IResourceCache _resourceCache;
|
private readonly IResourceCache _resourceCache;
|
||||||
private readonly IConfigurationManager _configSystem;
|
private readonly IConfigurationManager _configSystem;
|
||||||
|
private readonly ILocalizationManager _localizationManager;
|
||||||
|
|
||||||
private BaseButton QuitButton;
|
private BaseButton QuitButton;
|
||||||
private BaseButton OptionsButton;
|
private BaseButton OptionsButton;
|
||||||
@@ -31,9 +33,10 @@ namespace Content.Client.UserInterface
|
|||||||
IPlacementManager placementManager,
|
IPlacementManager placementManager,
|
||||||
IPrototypeManager prototypeManager,
|
IPrototypeManager prototypeManager,
|
||||||
IResourceCache resourceCache,
|
IResourceCache resourceCache,
|
||||||
IConfigurationManager configSystem)
|
IConfigurationManager configSystem, ILocalizationManager localizationManager)
|
||||||
{
|
{
|
||||||
_configSystem = configSystem;
|
_configSystem = configSystem;
|
||||||
|
_localizationManager = localizationManager;
|
||||||
_console = console;
|
_console = console;
|
||||||
__tileDefinitionManager = tileDefinitionManager;
|
__tileDefinitionManager = tileDefinitionManager;
|
||||||
_placementManager = placementManager;
|
_placementManager = placementManager;
|
||||||
@@ -92,7 +95,7 @@ namespace Content.Client.UserInterface
|
|||||||
|
|
||||||
private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
|
private void OnSpawnEntitiesButtonClicked(BaseButton.ButtonEventArgs args)
|
||||||
{
|
{
|
||||||
var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache);
|
var window = new EntitySpawnWindow(_placementManager, _prototypeManager, _resourceCache, _localizationManager);
|
||||||
window.OpenToLeft();
|
window.OpenToLeft();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Submodule RobustToolbox updated: 8d2ea9aed1...c8a28b8c83
Reference in New Issue
Block a user