- add support for the (as of now) newest version of the Unity re-releases

# Conflicts:
#	src/gi.h
#	src/win32/i_steam.cpp
#	wadsrc_extra/static/iwadinfo.txt

(with Rachael's flag and hacked JPL's fix)

# Conflicts:
#	src/gi.h
This commit is contained in:
drfrag 2020-09-03 23:36:19 -04:00
parent e65d7b4aee
commit 258d9dde25
7 changed files with 24 additions and 3 deletions

View file

@ -177,6 +177,13 @@ 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"))
{
sc.MustGetStringName("=");
sc.MustGetNumber();
if (sc.Number) iwad->flags |= GI_ALWAYSCENTERSBAR;
else iwad->flags &= ~GI_ALWAYSCENTERSBAR;
}
else if (sc.Compare("Load"))
{
sc.MustGetStringName("=");

View file

@ -204,6 +204,7 @@ CUSTOM_CVAR (Int, fraglimit, 0, CVAR_SERVERINFO)
CVAR (Float, timelimit, 0.f, CVAR_SERVERINFO);
CVAR (Int, wipetype, 1, CVAR_ARCHIVE);
CVAR (Int, snd_drawoutput, 0, 0);
CVAR (Bool, fixunitystatusbar, false, 0);
CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL)
{
bool res = false;
@ -2640,6 +2641,9 @@ static int D_DoomMain_Internal (void)
TexMan.Init();
C_InitConback();
if (gameinfo.flags & GI_ALWAYSCENTERSBAR)
fixunitystatusbar = true;
StartScreen->Progress();
V_InitFonts();

View file

@ -50,6 +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
};
#include "gametype.h"

View file

@ -1140,7 +1140,9 @@ TArray<FString> I_GetSteamPath()
"hexen deathkings of the dark citadel/base",
"ultimate doom/base",
"DOOM 3 BFG Edition/base/wads",
"Strife"
"Strife",
"Ultimate Doom/rerelease/DOOM_Data/StreamingAssets",
"Doom 2/rerelease/DOOM II_Data/StreamingAssets"
};
FString path;

View file

@ -3,7 +3,7 @@ include "mapinfo/doom2.txt"
gameinfo
{
titlepage = "DMENUPIC"
}
clearepisodes

View file

@ -38,7 +38,10 @@ class DoomStatusBar : BaseStatusBar
protected void DrawMainBar (double TicFrac)
{
if (!fixunitystatusbar)
DrawImage("STBAR", (0, 168), DI_ITEM_OFFSETS);
else
DrawImage("STBAR", (160, 200), DI_ITEM_CENTER_BOTTOM);
DrawImage("STTPRCNT", (90, 171), DI_ITEM_OFFSETS);
DrawImage("STTPRCNT", (221, 171), DI_ITEM_OFFSETS);

View file

@ -336,6 +336,7 @@ IWad
"DPHOOF","BFGGA0","HEADA1","CYBRA1","SPIDA1D1", "E4M2",
"DMENUPIC"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
}
IWad
@ -418,6 +419,7 @@ IWad
Compatibility = "Shorttex", "Stairs"
MustContain = "MAP01", "REDTNT2", "DMAPINFO"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
}
IWad
@ -444,6 +446,7 @@ IWad
Compatibility = "Shorttex"
MustContain = "MAP01", "CAMO1", "DMAPINFO"
BannerColors = "00 7c 00", "a8 a8 a8"
AlwaysCenterStatusbar = 1
}
IWad
@ -500,6 +503,7 @@ IWad
MustContain = "MAP01", "DMENUPIC"
BannerColors = "00 7c 00", "a8 a8 a8"
Load = "nerveunity.wad"
AlwaysCenterStatusbar = 1
}
IWad