From f4c9c5df72c17e47efb3c10b7e3da65aa16b8d8d Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 20 Jan 2022 17:51:43 -0500 Subject: [PATCH] - hook up GLDEFS parser and do some final fixes --- source/core/gamecontrol.cpp | 2 ++ source/core/r_data/gldefs.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp index 97a39d87165..e3a9917a055 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp @@ -148,6 +148,7 @@ void FontCharCreated(FGameTexture* base, FGameTexture* untranslated); void LoadVoxelModels(); void MarkMap(); void BuildFogTable(); +void ParseGLDefs(); DStatusBarCore* StatusBar; @@ -1063,6 +1064,7 @@ int RunGame() gi->app_init(); StartScreen->Progress(); G_ParseMapInfo(); + ParseGLDefs(); ReplaceMusics(true); CreateStatusBar(); SetDefaultMenuColors(); diff --git a/source/core/r_data/gldefs.cpp b/source/core/r_data/gldefs.cpp index 727e4738099..4e334b12887 100644 --- a/source/core/r_data/gldefs.cpp +++ b/source/core/r_data/gldefs.cpp @@ -1799,9 +1799,11 @@ class GLDefsParser case TAG_MATERIAL: ParseMaterial(); break; +#endif case TAG_HARDWARESHADER: ParseHardwareShader(); break; +#if 0 case TAG_DETAIL: ParseDetailTexture(); break;