Deh Reader: The BEX "include" directive should be ignored in patch lumps

skyjake · Aug 22, 2012 · 0466837 · 0466837
1 parent a1a7e80
commit 0466837
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/doomsday/plugins/dehread/include/dehreader.h b/doomsday/plugins/dehread/include/dehreader.h
@@ -36,7 +36,8 @@
 /// Flags used with @see readDehPatch() to alter read behavior.
 enum DehReaderFlag
 {
-    NoText      = 0x1 ///< Ignore Text patches.
+    NoInclude   = 0x1, ///< Including of other patch files is disabled.
+    NoText      = 0x2  ///< Ignore Text patches.
 };
 Q_DECLARE_FLAGS(DehReaderFlags, DehReaderFlag)
 

diff --git a/doomsday/plugins/dehread/src/dehread.cpp b/doomsday/plugins/dehread/src/dehread.cpp
@@ -84,7 +84,7 @@ static void readLump(lumpnum_t lumpNum)
     Con_Message("Applying DeHackEd patch lump #%i \"%s:%s\"...\n", lumpNum,
                 F_PrettyPath(W_LumpSourceFile(lumpNum)), W_LumpName(lumpNum));
 
-    readDehPatch(deh);
+    readDehPatch(deh, NoInclude);
 }
 
 static void readFile(const String& filePath)

diff --git a/doomsday/plugins/dehread/src/dehreader.cpp b/doomsday/plugins/dehread/src/dehreader.cpp
@@ -578,6 +578,13 @@ class DehReader
 
     void parseInclude(QString& arg)
     {
+        if(flags & NoInclude)
+        {
+            LOG_AS("parseInclude");
+            LOG_DEBUG("Skipping disabled Include directive.");
+            return;
+        }
+
         if(stackDepth > maxIncludeDepth)
         {
             LOG_AS("parseInclude");