Skip to content

Commit cc0c629

Browse files
committed
Give scripts easy access to FileManager so they can read files from the game directory
1 parent 622dbda commit cc0c629

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/TSMapEditor/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace TSMapEditor
44
{
55
public static class Constants
66
{
7-
public const string ReleaseVersion = "1.7.3";
7+
public const string ReleaseVersion = "1.7.4";
88

99
public static int CellSizeX = 48;
1010
public static int CellSizeY = 24;

src/TSMapEditor/Models/Map.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public bool ReloadINI()
7676
return true;
7777
}
7878

79-
LoadedINI = new IniFileEx(LoadedINI.FileName, ccFileManager);
79+
LoadedINI = new IniFileEx(LoadedINI.FileName, FileManager);
8080

8181
ReloadSections();
8282

@@ -203,7 +203,7 @@ public Rectangle LocalSize
203203

204204
private readonly Initializer initializer;
205205

206-
private readonly CCFileManager ccFileManager;
206+
public CCFileManager FileManager { get; }
207207

208208
public Map()
209209
{
@@ -218,7 +218,7 @@ public Map(CCFileManager ccFileManager)
218218

219219
initializer = new Initializer(this);
220220

221-
this.ccFileManager = ccFileManager;
221+
this.FileManager = ccFileManager;
222222
}
223223

224224
private void InitEditorConfig()
@@ -235,7 +235,7 @@ public void InitNew(GameConfigINIFiles gameConfigINIFiles, string theaterName, P
235235
InitEditorConfig();
236236
InitializeRules(gameConfigINIFiles);
237237
LoadedINI = new IniFileEx();
238-
var baseMap = Helpers.ReadConfigINIEx("BaseMap.ini", ccFileManager);
238+
var baseMap = Helpers.ReadConfigINIEx("BaseMap.ini", FileManager);
239239
baseMap.RemoveSection("INISystem");
240240
baseMap.FileName = string.Empty;
241241
baseMap.SetStringValue("Map", "Theater", theaterName);
@@ -290,7 +290,7 @@ public void LoadExisting(GameConfigINIFiles gameConfigINIFiles, IniFile mapIni)
290290

291291
Lighting.ReadFromIniFile(mapIni);
292292

293-
StringTable = new(ccFileManager.CsfFiles);
293+
StringTable = new(FileManager.CsfFiles);
294294
}
295295

296296
private void CreateGraphicalNodesFromBaseNodes()

src/TSMapEditor/Scripts/ScriptRunner.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System;
44
using System.IO;
55
using System.Reflection;
6+
using TSMapEditor.CCEngine;
67
using TSMapEditor.Models;
78
using TSMapEditor.Rendering;
89
using TSMapEditor.UI;
@@ -19,8 +20,9 @@ public class ScriptDependencies
1920
public EditorState EditorState;
2021
public WindowManager WindowManager;
2122
public WindowController WindowController;
23+
public CCFileManager FileManager;
2224

23-
public ScriptDependencies(Map map, ICursorActionTarget cursorActionTarget, EditorState editorState, WindowManager windowManager, WindowController windowController)
25+
public ScriptDependencies(Map map, ICursorActionTarget cursorActionTarget, EditorState editorState, WindowManager windowManager, WindowController windowController, CCFileManager fileManager)
2426
{
2527
Map = map;
2628
CursorActionTarget = cursorActionTarget;

src/TSMapEditor/UI/Windows/WindowController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void Initialize(IWindowParentControl windowParentControl, Map map, Editor
173173
ApplyINICodeWindow = new ApplyINICodeWindow(windowParentControl.WindowManager, map);
174174
Windows.Add(ApplyINICodeWindow);
175175

176-
RunScriptWindow = new RunScriptWindow(windowParentControl.WindowManager, new Scripts.ScriptDependencies(map, cursorActionTarget, editorState, windowParentControl.WindowManager, this));
176+
RunScriptWindow = new RunScriptWindow(windowParentControl.WindowManager, new Scripts.ScriptDependencies(map, cursorActionTarget, editorState, windowParentControl.WindowManager, this, map.FileManager));
177177
Windows.Add(RunScriptWindow);
178178

179179
HotkeyConfigurationWindow = new HotkeyConfigurationWindow(windowParentControl.WindowManager);

0 commit comments

Comments
 (0)