Skip to content

Commit 3724cd5

Browse files
committed
Load BaseMap like other configuration files
1 parent 9837069 commit 3724cd5

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/TSMapEditor/Helpers.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
using System.Globalization;
88
using System.IO;
99
using System.Linq;
10+
using TSMapEditor.CCEngine;
11+
using TSMapEditor.Extensions;
1012
using TSMapEditor.GameMath;
1113
using TSMapEditor.Models;
1214
using TSMapEditor.Models.Enums;
@@ -747,5 +749,16 @@ public static IniFile ReadConfigINI(string path)
747749

748750
return new IniFile(defaultPath);
749751
}
752+
753+
public static IniFileEx ReadConfigINIEx(string path, CCFileManager fileManager)
754+
{
755+
string customPath = Path.Combine(Environment.CurrentDirectory, "Config", path);
756+
string defaultPath = Path.Combine(Environment.CurrentDirectory, "Config", "Default", path);
757+
758+
if (File.Exists(customPath))
759+
return new IniFileEx(customPath, fileManager);
760+
761+
return new IniFileEx(defaultPath, fileManager);
762+
}
750763
}
751764
}

src/TSMapEditor/Models/Map.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public void InitNew(GameConfigINIFiles gameConfigINIFiles, string theaterName, P
229229
InitEditorConfig();
230230
InitializeRules(gameConfigINIFiles);
231231
LoadedINI = new IniFileEx();
232-
var baseMap = new IniFileEx(Environment.CurrentDirectory + "/Config/BaseMap.ini", ccFileManager);
232+
var baseMap = Helpers.ReadConfigINIEx("BaseMap.ini", ccFileManager);
233233
baseMap.RemoveSection("INISystem");
234234
baseMap.FileName = string.Empty;
235235
baseMap.SetStringValue("Map", "Theater", theaterName);

0 commit comments

Comments
 (0)