From b11298afd5c73d62e43cad4e77015f398bde0d75 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 7 Sep 2020 23:30:40 -0400 Subject: [PATCH] - rename 'AlwaysCenterStatusBar' to 'FixUnityStatusBar', original name became a misnomer especially with updates that made it more specific in its use --- src/d_iwad.cpp | 6 +++--- src/d_main.cpp | 2 +- src/gamedata/gi.h | 2 +- wadsrc_extra/static/iwadinfo.txt | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index ceedcd51b..6ba93f958 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -184,12 +184,12 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize, if (sc.Number) iwad->flags |= GI_IGNORETITLEPATCHES; else iwad->flags &= ~GI_IGNORETITLEPATCHES; } - else if (sc.Compare("AlwaysCenterStatusBar")) + else if (sc.Compare("FixUnityStatusBar")) { sc.MustGetStringName("="); sc.MustGetNumber(); - if (sc.Number) iwad->flags |= GI_ALWAYSCENTERSBAR; - else iwad->flags &= ~GI_ALWAYSCENTERSBAR; + if (sc.Number) iwad->flags |= GI_FIXUNITYSBAR; + else iwad->flags &= ~GI_FIXUNITYSBAR; } else if (sc.Compare("Load")) { diff --git a/src/d_main.cpp b/src/d_main.cpp index 600a69c65..33872d37e 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -2964,7 +2964,7 @@ static void CheckForHacks(BuildInfo& buildinfo) static void FixUnityStatusBar() { - if (gameinfo.flags & GI_ALWAYSCENTERSBAR) + if (gameinfo.flags & GI_FIXUNITYSBAR) { FGameTexture* sbartex = TexMan.FindGameTexture("stbar", ETextureType::MiscPatch); diff --git a/src/gamedata/gi.h b/src/gamedata/gi.h index 6f1eaa90f..c83570120 100644 --- a/src/gamedata/gi.h +++ b/src/gamedata/gi.h @@ -50,7 +50,7 @@ enum GI_COMPATPOLY1 = 0x00000040, // Hexen's MAP36 needs old polyobject drawing GI_COMPATPOLY2 = 0x00000080, // so does HEXDD's MAP47 GI_IGNORETITLEPATCHES = 0x00000200, // Ignore the map name graphics when not runnning in English language - GI_ALWAYSCENTERSBAR = 0x00000400, // Always center the status bar + GI_FIXUNITYSBAR = 0x00000400, // Center the status bar if it's too wide for a 320 screen }; #include "gametype.h" diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt index 6edbb0536..ffb230b32 100644 --- a/wadsrc_extra/static/iwadinfo.txt +++ b/wadsrc_extra/static/iwadinfo.txt @@ -351,7 +351,7 @@ IWad Load = "extras.wad", "soundtrack" BannerColors = "00 7c 00", "a8 a8 a8" IgnoreTitlePatches = 1 - AlwaysCenterStatusbar = 1 + FixUnityStatusBar = 1 } IWad @@ -365,7 +365,7 @@ IWad MustContain = "SMOOSHED", "ANIMDEFS", "LANGUAGE", "MAPINFO", "ENDOOM", "M_DOOM", "TITLEPIC", "TEXTURES" BannerColors = "a8 00 00", "a8 a8 a8" IgnoreTitlePatches = 1 - AlwaysCenterStatusbar = 1 + FixUnityStatusBar = 1 } IWad @@ -441,7 +441,7 @@ IWad MustContain = "MAP01", "REDTNT2", "DMAPINFO" BannerColors = "00 7c 00", "a8 a8 a8" IgnoreTitlePatches = 1 - AlwaysCenterStatusbar = 1 + FixUnityStatusBar = 1 } IWad @@ -470,7 +470,7 @@ IWad MustContain = "MAP01", "CAMO1", "DMAPINFO" BannerColors = "00 7c 00", "a8 a8 a8" IgnoreTitlePatches = 1 - AlwaysCenterStatusbar = 1 + FixUnityStatusBar = 1 } IWad @@ -515,7 +515,7 @@ IWad BannerColors = "00 7c 00", "a8 a8 a8" IgnoreTitlePatches = 1 Load = "nerveunity.wad", "extras.wad", "soundtrack" - AlwaysCenterStatusbar = 1 + FixUnityStatusBar = 1 } IWad