From ecda537b60f6251e11ccef1a145c8dbb345b09cf Mon Sep 17 00:00:00 2001 From: MsrSgtShooterPerson Date: Thu, 24 Oct 2024 17:00:52 +0800 Subject: [PATCH] Redid code glowing flats insertion --- games/doom/resources.lua | 2 ++ games/heretic/resources.lua | 1 + modules/zdoom_otex.lua | 46 ++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/games/doom/resources.lua b/games/doom/resources.lua index 62cefc3ecf..93e54618f3 100644 --- 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 index c29aee9941..80646f0b7a 100644 --- 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 index 1c05df9aa9..f02ba5566c 100644 --- 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