diff --git a/GameRes/FormatCatalog.cs b/GameRes/FormatCatalog.cs index 0c025b80..6a0ec4ec 100644 --- a/GameRes/FormatCatalog.cs +++ b/GameRes/FormatCatalog.cs @@ -72,16 +72,19 @@ namespace GameRes public int CurrentSchemeVersion { get; private set; } public string SchemeID { get { return "GARbroDB"; } } public string AssemblyLocation { get { return m_gameres_dir.Value; } } - public string DataDirectory { get { return AssemblyLocation; } } + public string DataDirectory { get { return m_gamedata_dir.Value; } } public Exception LastError { get; set; } public event ParametersRequestEventHandler ParametersRequest; private Lazy m_gameres_dir = new Lazy (() => Path.GetDirectoryName (System.Reflection.Assembly.GetExecutingAssembly().Location)); + private Lazy m_gamedata_dir; private FormatCatalog () { + m_gamedata_dir = new Lazy (() => Path.Combine (AssemblyLocation, "GameData")); + //An aggregate catalog that combines multiple catalogs var catalog = new AggregateCatalog(); //Adds all the parts found in the same assembly as the Program class