zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- rename 'AlwaysCenterStatusBar' to 'FixUnityStatusBar', original name became a misnomer especially with updates that made it more specific in its use

Browse source 
# Conflicts:
#	src/gi.h
#	wadsrc_extra/static/iwadinfo.txt

# Conflicts:
#	src/gi.h
This commit is contained in:
Rachael Alexanderson 2020-09-07 23:30:40 -04:00 committed by drfrag
parent 1af7e9ac8e
commit 8c2d89e1eb
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_iwad.cpp
View file

@ -177,12 +177,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"))
{

2
src/d_main.cpp
View file

@ -2404,7 +2404,7 @@ static void NewFailure ()
static void FixUnityStatusBar()
{
if (gameinfo.flags & GI_ALWAYSCENTERSBAR)
if (gameinfo.flags & GI_FIXUNITYSBAR)
{
FTexture* sbartex = TexMan.FindTexture("stbar", ETextureType::MiscPatch);

2
src/gi.h
View file

@ -50,7 +50,7 @@ enum
GI_COMPATPOLY2 = 0x00000080, // so does HEXDD's MAP47
GI_NOTEXTCOLOR = 0x00000100, // Chex Quest 3 would have everything green
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"

10
wadsrc_extra/static/iwadinfo.txt
View file

@ -337,7 +337,7 @@ IWad
"DMENUPIC"
Load = "extras.wad", "soundtrack"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
FixUnityStatusBar = 1
}
IWad
@ -350,7 +350,7 @@ IWad
Compatibility = "Shorttex"
MustContain = "SMOOSHED", "ANIMDEFS", "LANGUAGE", "MAPINFO", "ENDOOM", "M_DOOM", "TITLEPIC", "TEXTURES"
BannerColors = "a8 00 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
FixUnityStatusBar = 1
}
IWad
@ -421,7 +421,7 @@ IWad
Compatibility = "Shorttex", "Stairs"
MustContain = "MAP01", "REDTNT2", "DMAPINFO"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
FixUnityStatusBar = 1
}
IWad
@ -448,7 +448,7 @@ IWad
Compatibility = "Shorttex"
MustContain = "MAP01", "CAMO1", "DMAPINFO"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
FixUnityStatusBar = 1
}
IWad
@ -505,7 +505,7 @@ IWad
MustContain = "MAP01", "DMENUPIC"
BannerColors = "00 7c 00", "a8 a8 a8"
Load = "nerveunity.wad", "extras.wad", "soundtrack"
AlwaysCenterStatusbar = 1
FixUnityStatusBar = 1
}
IWad