Fix up enemy viewer, reduce some memory footprint
This commit is contained in:
@@ -21,7 +21,7 @@ public partial class App : Node, IApp
|
||||
|
||||
public const string GAME_SCENE_PATH = "res://src/game/Game.tscn";
|
||||
|
||||
public const string ENEMY_VIEWER_PATH = "res://src/data_viewer/DataViewer.tscn";
|
||||
public const string ENEMY_VIEWER_PATH = "res://src/enemy_viewer/EnemyViewer.tscn";
|
||||
|
||||
[Node] private MainMenu MainMenu { get; set; } = default!;
|
||||
|
||||
@@ -40,14 +40,14 @@ public partial class App : Node, IApp
|
||||
private Godot.Collections.Array _progress;
|
||||
private SimpleInjector.Container _container;
|
||||
|
||||
private DataViewer _dataViewer;
|
||||
private EnemyViewer _dataViewer;
|
||||
private bool _loadingGame = false;
|
||||
private bool _loadingEnemyViewer = false;
|
||||
private string _optionsSavePath = string.Empty;
|
||||
private string _controllerSavePath = string.Empty;
|
||||
private ISaveFileManager _saveFileManager;
|
||||
private IGame _game;
|
||||
private IDataViewer _enemyViewer;
|
||||
private IEnemyViewer _enemyViewer;
|
||||
|
||||
private double _reportedProgress = 0;
|
||||
|
||||
@@ -173,7 +173,7 @@ public partial class App : Node, IApp
|
||||
.Handle((in AppLogic.Output.EnemyViewerExited _) =>
|
||||
{
|
||||
LoadingScreen.HideLoadingScreen();
|
||||
if (_enemyViewer != null && _enemyViewer is DataViewer enemyViewer)
|
||||
if (_enemyViewer != null && _enemyViewer is EnemyViewer enemyViewer)
|
||||
enemyViewer.CallDeferred(MethodName.QueueFree);
|
||||
MainMenu.Show();
|
||||
MainMenu.EnemyViewerButton.GrabFocus();
|
||||
@@ -211,7 +211,7 @@ public partial class App : Node, IApp
|
||||
private async void LoadEnemyViewer(string sceneName)
|
||||
{
|
||||
var scene = await LoadSceneInternal(sceneName);
|
||||
_enemyViewer = scene as IDataViewer;
|
||||
_enemyViewer = scene as IEnemyViewer;
|
||||
CallDeferred(MethodName.AddChild, scene);
|
||||
LoadingScreen.HideLoadingScreen();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user