zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into renderstate_abstraction

Browse source
This commit is contained in:
Christoph Oelckers 2018-10-25 22:30:26 +02:00
commit 21b658d34f
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/g_statusbar/shared_sbar.cpp
View file

@ -588,6 +588,13 @@ DEFINE_ACTION_FUNCTION(DBaseStatusBar, BeginHUD)
return 0; return 0;
} }
DEFINE_ACTION_FUNCTION(DBaseStatusBar, UpdateScreenGeometry)
{
PARAM_SELF_PROLOGUE(DBaseStatusBar);
setsizeneeded = true;
return 0;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// PROC AttachToPlayer // PROC AttachToPlayer

16
wadsrc/static/zscript/level_compatibility.txt
View file

@ -5,6 +5,22 @@ class LevelCompatibility play
{ {
switch (checksum) switch (checksum)
{ {
case '9527DD0809FDA39CCFC316A21D135783': // HACX.WAD map05
{
// fix non-functional self-referencing sector hack.
for(int i = 578; i < 582; i++)
SetLineSectorRef(i, Line.back, 91);
for(int i = 707; i < 714; i++)
SetLineSectorRef(i, Line.back, 91);
SetLineSectorRef(736, Line.front, 91);
SetLineSectorRef(659, Line.front, 91);
SetLineSpecial(659, Transfer_Heights, 60);
break;
}
case 'E2B5D1400279335811C1C1C0B437D9C8': // Deathknights of the Dark Citadel, map54 case 'E2B5D1400279335811C1C1C0B437D9C8': // Deathknights of the Dark Citadel, map54
{ {
// This map has two gear boxes which are flagged for player cross // This map has two gear boxes which are flagged for player cross

4
wadsrc/static/zscript/statusbar/statusbar.txt
View file

@ -318,6 +318,8 @@ class BaseStatusBar native ui
native void BeginStatusBar(bool forceScaled = false, int resW = -1, int resH = -1, int rel = -1); native void BeginStatusBar(bool forceScaled = false, int resW = -1, int resH = -1, int rel = -1);
native void BeginHUD(double Alpha = 1., bool forcescaled = false, int resW = -1, int resH = -1); native void BeginHUD(double Alpha = 1., bool forcescaled = false, int resW = -1, int resH = -1);
native void UpdateScreenGeometry();
virtual void Init() virtual void Init()
{ {
mSmallFont = HUDFont.Create("SmallFont"); mSmallFont = HUDFont.Create("SmallFont");
@ -330,7 +332,7 @@ class BaseStatusBar native ui
native virtual clearscope void SetMugShotState (String state_name, bool wait_till_done=false, bool reset=false); native virtual clearscope void SetMugShotState (String state_name, bool wait_till_done=false, bool reset=false);
virtual void FlashItem (class<Inventory> itemtype) { artiflashTick = 4; itemflashFade = 0.75; } virtual void FlashItem (class<Inventory> itemtype) { artiflashTick = 4; itemflashFade = 0.75; }
virtual void AttachToPlayer (PlayerInfo player) { CPlayer = player; } virtual void AttachToPlayer (PlayerInfo player) { CPlayer = player; UpdateScreenGeometry(); }
virtual void FlashCrosshair () { CrosshairSize = XHAIRPICKUPSIZE; } virtual void FlashCrosshair () { CrosshairSize = XHAIRPICKUPSIZE; }
virtual void NewGame () { if (CPlayer != null) AttachToPlayer(CPlayer); } virtual void NewGame () { if (CPlayer != null) AttachToPlayer(CPlayer); }
virtual void ShowPop (int popnum) { ShowLog = (popnum == POP_Log && !ShowLog); } virtual void ShowPop (int popnum) { ShowLog = (popnum == POP_Log && !ShowLog); }