diff --git a/Source/Core/Compilers/AccCompiler.cs b/Source/Core/Compilers/AccCompiler.cs index e28b58eb484b6e394f73243a28ee387031e2a4c2..c5fd8eacaaf185222fa6eb728c66fa6afa1d8107 100644 --- a/Source/Core/Compilers/AccCompiler.cs +++ b/Source/Core/Compilers/AccCompiler.cs @@ -78,9 +78,8 @@ namespace CodeImp.DoomBuilder.Compilers foreach(string include in includes) { // Grab the script text from the resources - TextResourceData data = General.Map.Data.LoadFile(include); - - if(data.Stream != null) + TextResourceData data = General.Map.Data.GetTextResourceData(include); + if(data != null && data.Stream != null) { // Pull the pk3 or directory sub folder out if applicable FileInfo fi = new FileInfo(Path.Combine(this.tempdir.FullName, include)); diff --git a/Source/Core/Controls/ScriptFileDocumentTab.cs b/Source/Core/Controls/ScriptFileDocumentTab.cs index bf04eced831df72cd29ba1f51de31962f6639243..ac4f50a51872063c140e522e900d04dec3300694 100644 --- a/Source/Core/Controls/ScriptFileDocumentTab.cs +++ b/Source/Core/Controls/ScriptFileDocumentTab.cs @@ -177,7 +177,7 @@ namespace CodeImp.DoomBuilder.Controls { OnInclude = delegate(AcsParserSE se, string includefile, AcsParserSE.IncludeType includetype) { - TextResourceData data = General.Map.Data.LoadFile(includefile); + TextResourceData data = General.Map.Data.GetTextResourceData(includefile); if(data == null) { // Fial diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs index a3521ddd037d9de93109a732495e0ad7c30d9cd3..54e6b1f4121981b1985c5507e3a143eed904a354 100644 --- a/Source/Core/Data/DataManager.cs +++ b/Source/Core/Data/DataManager.cs @@ -2350,7 +2350,7 @@ namespace CodeImp.DoomBuilder.Data } //mxd - internal TextResourceData LoadFile(string name) + internal TextResourceData GetTextResourceData(string name) { // Filesystem path? if(Path.IsPathRooted(name)) diff --git a/Source/Core/General/MapManager.cs b/Source/Core/General/MapManager.cs index 01874a84170c171ca16af275a2371c352bedddf9..1c425f5b095e3a4c1b0f85baac5316bf45442441 100644 --- a/Source/Core/General/MapManager.cs +++ b/Source/Core/General/MapManager.cs @@ -2157,7 +2157,7 @@ namespace CodeImp.DoomBuilder IgnoreErrors = true, OnInclude = delegate(AcsParserSE se, string includefile, AcsParserSE.IncludeType includetype) { - TextResourceData includedata = General.Map.Data.LoadFile(includefile); + TextResourceData includedata = General.Map.Data.GetTextResourceData(includefile); if(includedata != null) { includedata.Trackable = true;