Merge pull request #674 from GTD-Carthage/content-unstable

Upstream sync
obsidian-level-maker · Oct 25, 2024 · 71c17dd · 71c17dd
2 parents 6432736 + ddbb037
commit 71c17dd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/games/doom/resources.lua b/games/doom/resources.lua
@@ -823,6 +823,8 @@ Glow
     T_CL43Y
     T_CL43G
     T_CL43P
+
+    GLOWFLTS
   }
 
   Texture "FWATER1", 0a0ac4, 128

diff --git a/games/heretic/resources.lua b/games/heretic/resources.lua
@@ -667,6 +667,7 @@ Glow
     FLTTELE3
     FLTTELE4
 
+    GLOWFLTS
   }
 
 //  Texture "FLTWAWA1", 0a0ac4, 128

diff --git a/modules/zdoom_otex.lua b/modules/zdoom_otex.lua
@@ -518,6 +518,24 @@ OTEX_SPECIAL_RESOURCES =
   }
 }
 
+OTEX_GLOWING_FLATS =
+[[
+    OBLODA01
+    OGOOPY01
+    OICYWA01
+    OLAVAA01
+    OLAVAA02
+    OLAVAB01
+    OLAVAC01
+    OLAVAD01
+    OLAVAE01
+    OLAVAF01
+    ONUKEA01
+    OSLUDG01
+    OPOOPY01
+    OTAR__01
+    OWATER01
+]]
 
 function OTEX_PROC_MODULE.setup(self)
   PARAM.OTEX_module_activated = true
@@ -838,30 +856,10 @@ end
 
 
 function OTEX_PROC_MODULE.all_done()
-  SCRIPTS.gldefs = ScriptMan_combine_script(SCRIPTS.gldefs, 
-[[
-Glow
-{
-  Flats
-  {
-    OBLODA01
-    OGOOPY01
-    OICYWA01
-    OLAVAA01
-    OLAVAA02
-    OLAVAB01
-    OLAVAC01
-    OLAVAD01
-    OLAVAE01
-    OLAVAF01
-    ONUKEA01
-    OSLUDG01
-    OPOOPY01
-    OTAR__01
-    OWATER01
-  }
-}
-]]
+  string.gsub(
+    GAME.RESOURCES.GLOWING_FLATS_GLDEFS,
+    "GLOWFLTS",
+    OTEX_GLOWING_FLATS
   )
 end