From 0ba7b25090a1a48c7df8f6b027e98b4af55ea73f Mon Sep 17 00:00:00 2001 From: MotoLegacy Date: Mon, 4 Mar 2024 17:33:54 -0500 Subject: [PATCH] Guard __TB_empty behind ZHLT_TRENCHBROOMNULL_FIX --- common/bspfile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/bspfile.cpp b/common/bspfile.cpp index 2599de7..5cb8ec0 100644 --- a/common/bspfile.cpp +++ b/common/bspfile.cpp @@ -1996,12 +1996,14 @@ char* GetTextureByNumber(int texturenumber) ofs = ((dmiptexlump_t*)g_dtexdata)->dataofs[info->miptex]; miptex = (miptex_t*)(&g_dtexdata[ofs]); +#ifdef ZHLT_TRENCHBROOMNULL_FIX // cypress -- hacked-in support for __TB_empty // just sorta replacing __TB_empty with null here, because // ericw-tools does the same thing, and this is the best // place to do it with the least amount of work required. if (!strncasecmp(miptex->name, "__TB_empty", 10)) return "null"; +#endif return miptex->name; }