From 78bfbdb25357eaea243b4dd4d1007784ae3b4ec8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 20 Aug 2020 00:55:31 +0200
Subject: [PATCH] - Exhumed status bar work.

Unfortunately this is a bit limited due to how the data was designed.
---
 source/blood/src/blood.cpp                    |   1 -
 source/core/statusbar.cpp                     |   2 +
 source/core/statusbar.h                       |   1 +
 source/exhumed/src/d_menu.cpp                 |   1 +
 source/exhumed/src/exhumed.cpp                | 103 +--
 source/exhumed/src/exhumed.h                  |   7 +-
 source/exhumed/src/map.cpp                    |   1 -
 source/exhumed/src/menu.cpp                   |   8 -
 source/exhumed/src/sequence.cpp               |  43 -
 source/exhumed/src/sequence.h                 |  10 +-
 source/exhumed/src/snake.cpp                  |   3 -
 source/exhumed/src/status.cpp                 | 733 ++++++++++--------
 source/exhumed/src/status.h                   |   3 -
 source/exhumed/src/view.cpp                   | 121 +--
 source/exhumed/src/view.h                     |   8 +-
 source/games/duke/src/sbar.cpp                |   5 -
 .../static/filter/exhumed/graphics/hud_l.png  | Bin 0 -> 3031 bytes
 .../static/filter/exhumed/graphics/hud_r.png  | Bin 0 -> 3132 bytes
 18 files changed, 477 insertions(+), 573 deletions(-)
 create mode 100644 wadsrc/static/filter/exhumed/graphics/hud_l.png
 create mode 100644 wadsrc/static/filter/exhumed/graphics/hud_r.png

diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index d94f46151..4924eb762 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -769,7 +769,6 @@ static void app_init()
     registerinputcommands();
 
     gChoke.sub_83ff0(518, sub_84230);
-    videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
     UpdateDacs(0, true);
 }
 
diff --git a/source/core/statusbar.cpp b/source/core/statusbar.cpp
index e11d7f315..5312f66db 100644
--- a/source/core/statusbar.cpp
+++ b/source/core/statusbar.cpp
@@ -416,7 +416,9 @@ void DBaseStatusBar::DrawGraphic(FGameTexture* tex, double x, double y, int flag
 		DTA_AlphaChannel, !!(flags & DI_ALPHAMAPPED),
 		DTA_FillColor, (flags & DI_ALPHAMAPPED) ? 0 : -1,
 		DTA_FlipX, !!(flags & DI_MIRROR),
+		DTA_FlipY, !!(flags& DI_MIRRORY),
 		DTA_Rotate, rotate,
+		DTA_FlipOffsets, true,
 		DTA_LegacyRenderStyle, style,
 		TAG_DONE);
 }
diff --git a/source/core/statusbar.h b/source/core/statusbar.h
index d8c2c4aae..4b7e297d8 100644
--- a/source/core/statusbar.h
+++ b/source/core/statusbar.h
@@ -274,6 +274,7 @@ enum DI_Flags
 	DI_DONTANIMATE = 0x800,		// do not animate the texture
 	DI_MIRROR = 0x1000,		// flip the texture horizontally, like a mirror
 	DI_ITEM_RELCENTER = 0x2000,
+	DI_MIRRORY = 0x40000000,
 		
 	DI_SCREEN_AUTO = 0,					// decide based on given offsets.
 	DI_SCREEN_MANUAL_ALIGN = 0x4000,	// If this is on, the following flags will have an effect
diff --git a/source/exhumed/src/d_menu.cpp b/source/exhumed/src/d_menu.cpp
index 3a89957a3..d12732d84 100644
--- a/source/exhumed/src/d_menu.cpp
+++ b/source/exhumed/src/d_menu.cpp
@@ -63,6 +63,7 @@ int menu_Menu(int nVal)
 		overwritesprite(270, 150, kTile3512 + ((dword_9AB5F + 2) & 3), 32, 3, kPalNormal);
 
 		HandleAsync();
+		D_ProcessEvents();
 		videoNextPage();
 
 	}
diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index dec80d496..e8464c8a8 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -55,6 +55,7 @@ BEGIN_PS_NS
 void FinishLevel();
 void uploadCinemaPalettes();
 int32_t registerosdcommands(void);
+void InitFonts();
 
 int htimer = 0;
 
@@ -467,22 +468,15 @@ void ResetEngine()
 
 void InstallEngine()
 {
-    // initgroupfile("stuff.dat");
 	TileFiles.LoadArtSet("tiles%03d.art");
 
-	// TEMP
-
-    //nScreenWidth *= 2;
-    //nScreenHeight *= 2;
-    bHiRes = true;
-    // TEMP
-
     if (engineInit())
     {
         G_FatalEngineError();
     }
     uploadCinemaPalettes();
     LoadPaletteLookups();
+    InitFonts();
     videoInit();
 
     enginecompatibility_mode = ENGINECOMPATIBILITY_19950829;
@@ -548,7 +542,6 @@ short nShadowPic;
 short nCreaturesLeft = 0;
 
 short nFreeze;
-short bFullScreen;
 
 short nSnakeCam = -1;
 
@@ -586,7 +579,6 @@ short forcelevel = -1;
 int lLocalButtons = 0;
 int lLocalCodes = 0;
 
-short bHiRes = false;
 short bCoordinates = false;
 
 int nNetTime = -1;
@@ -607,7 +599,6 @@ short nCurBodyNum = 0;
 
 short nBodyTotal = 0;
 
-short textpages;
 short lastfps;
 
 short nMapMode = 0;
@@ -621,8 +612,6 @@ short nFirstPassword = 0;
 short nFirstPassInfo = 0;
 short nPasswordCount = 0;
 
-short screensize;
-
 short bSnakeCam = false;
 short bRecord = false;
 short bPlayback = false;
@@ -632,6 +621,7 @@ short bDoFlashes = true;
 short bHolly = false;
 
 short nItemTextIndex;
+short besttarget;
 
 short scan_char = 0;
 
@@ -700,21 +690,6 @@ int MyGetStringWidth(const char *str)
     return nWidth;
 }
 
-void UpdateScreenSize()
-{
-    int xsize = xdim - scale(screensize*16, xdim, 320);
-    int ysize = scale(ydim, xsize, xdim);
-    int y1 = ((ydim >> 1) - (ysize >> 1));
-
-    MySetView(
-        (xdim >> 1) - (xsize >> 1),
-        y1,
-        (xdim >> 1) - (xsize >> 1) + xsize - 1,
-        (y1 + ysize - 1));
-
-    RefreshStatus();
-}
-
 void ResetPassword()
 {
     nCodeMin = nFirstPassword;
@@ -862,13 +837,33 @@ void CheckKeys()
     if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
     {
         buttonMap.ClearButton(gamefunc_Enlarge_Screen);
-        if (!nMapMode) G_ChangeHudLayout(1);
+        if (!nMapMode)
+        {
+            if (!SHIFTS_IS_PRESSED)
+            {
+                G_ChangeHudLayout(1);
+            }
+            else
+            {
+                hud_scale = hud_scale + 4;
+            }
+        }
     }
 
     if (buttonMap.ButtonDown(gamefunc_Shrink_Screen))
     {
         buttonMap.ClearButton(gamefunc_Shrink_Screen);
-        if (!nMapMode) G_ChangeHudLayout(-1);
+        if (!nMapMode)
+        {
+            if (!SHIFTS_IS_PRESSED)
+            {
+                G_ChangeHudLayout(-1);
+            }
+            else
+            {
+                hud_scale = hud_scale - 4;
+            }
+        }
     }
 
     // go to 3rd person view?
@@ -1153,8 +1148,6 @@ void DoCredits()
 		HandleAsync();
 		inputState.keyGetChar();
     }
-
-    Clip();
 }
 
 void FinishLevel()
@@ -1177,8 +1170,6 @@ void FinishLevel()
         videoNextPage();
         WaitTicks(12);
         WaitVBL();
-        RefreshBackground();
-        RefreshStatus();
         DrawView(65536);
         videoNextPage();
     }
@@ -1243,9 +1234,6 @@ uint8_t ReadPlaybackInputs()
 
 void SetHiRes()
 {
-    //nScreenWidth  = 640;
-    //nScreenHeight = 400;
-    bHiRes = true;
 }
 
 void DoClockBeep()
@@ -1384,12 +1372,16 @@ static void GameDisplay(void)
     auto smoothRatio = calc_smoothratio(totalclock, tclocks);
 
     DrawView(smoothRatio);
-
+    DrawStatusBar();
     if (paused && !M_Active())
     {
         int nLen = MyGetStringWidth("PAUSED");
         myprintext((320 - nLen) / 2, 100, "PAUSED", 0);
     }
+    if (M_Active())
+    {
+        D_ProcessEvents();
+    }
 
     videoNextPage();
 }
@@ -1711,10 +1703,6 @@ int GameInterface::app_main()
 
     ResetPassword();
 
-    // GetCurPal(NULL);
-
-    Printf("Initializing OSD...\n");
-
     registerosdcommands();
 
     if (nNetPlayerCount == -1)
@@ -2289,7 +2277,6 @@ void DoGameOverScene()
 
     NoClip();
     overwritesprite(0, 0, kTile3591, 0, 2, kPalNormal, 16);
-    Clip();
     videoNextPage();
     CinemaFadeIn();
     PlayGameOverSound();
@@ -2443,8 +2430,6 @@ void DoTitle()
     }
 
     WaitNoKey(1, KeyFn1);
-
-    videoSetViewableArea(nViewLeft, nViewTop, nViewRight, nViewBottom);
 }
 
 void CopyTileToBitmap(short nSrcTile,  short nDestTile, int xPos, int yPos)
@@ -3034,44 +3019,18 @@ bool GameInterface::CanSave()
     return !bRecord && !bPlayback && !paused && !bInDemo && nTotalPlayers == 1;
 }
 
-#if 0
-void GameInterface::UpdateScreenSize()
-{
-    if (hud_size == 8)
-    {
-        if (!bFullScreen)
-        {
-            bFullScreen = true;
-            screensize = 0;
-            UnMaskStatus();
-        }
-    }
-    else
-    {
-        screensize = (7 - clamp(*hud_size, 0, 7)) * 2;
-        bFullScreen = false;
-        Powerslave::UpdateScreenSize();
-    }
-}
-#endif
-
-
 ::GameInterface* CreateInterface()
 {
     return new GameInterface;
 }
 
-//short lastlevel;
-//short forcelevel = -1;
-//int lLocalCodes = 0;
-//int flash;
-//short textpages;
 
 // This is only the static global data.
 static SavegameHelper sgh("exhumed",
     SA(cPupData),
     SV(nPupData),
     SV(nPixels),
+    SV(besttarget),
     SA(curx),
     SA(cury),
     SA(destvelx),
diff --git a/source/exhumed/src/exhumed.h b/source/exhumed/src/exhumed.h
index 2b10ffd88..f9efcfe3d 100644
--- a/source/exhumed/src/exhumed.h
+++ b/source/exhumed/src/exhumed.h
@@ -277,18 +277,12 @@ extern short bNoCreatures;
 extern short nLocalSpr;
 extern short levelnew;
 
-extern short textpages;
-
 extern short nSnakeCam;
 
-extern short bHiRes;
 extern short bCoordinates;
-extern short bFullScreen;
 
 extern short bHolly;
 
-extern short screensize;
-
 extern int totalmoves;
 
 extern int lCountDown;
@@ -364,6 +358,7 @@ struct GameInterface : ::GameInterface
     bool LoadGame(FSaveGameNode* sv) override;
     bool SaveGame(FSaveGameNode* sv) override;
     bool CanSave() override;
+    ReservedSpace GetReservedScreenSpace(int viewsize) override { return { 0, 24 }; }
 
     FString statFPS() override;
     //GameStats getStats() override;
diff --git a/source/exhumed/src/map.cpp b/source/exhumed/src/map.cpp
index 2db16f23c..62d761cb8 100644
--- a/source/exhumed/src/map.cpp
+++ b/source/exhumed/src/map.cpp
@@ -470,7 +470,6 @@ void DrawMap()
         if (nMapMode == 2)
         {
             twod->ClearScreen();
-            RefreshBackground();
             renderDrawMapView(initx, inity, lMapZoom, inita);
         }
         G_DrawOverheadMap(initx, inity, lMapZoom, inita);
diff --git a/source/exhumed/src/menu.cpp b/source/exhumed/src/menu.cpp
index 20c660f23..0f48e9b88 100644
--- a/source/exhumed/src/menu.cpp
+++ b/source/exhumed/src/menu.cpp
@@ -626,7 +626,6 @@ int menu_DrawTheMap(int nLevel, int nLevelNew, int nLevelBest)
     int startTime = (int)totalclock;
 
     inputState.ClearAllInput();
-    UnMaskStatus();
     videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
 
     // 0-offset the level numbers
@@ -834,7 +833,6 @@ int menu_DrawTheMap(int nLevel, int nLevelNew, int nLevelBest)
         }
     }
 
-    MySetView(nViewLeft, nViewTop, nViewRight, nViewBottom);
     return nLevelNew + 1;
 }
 
@@ -1163,8 +1161,6 @@ void DoCinemaText(short nVal)
 
 void GoToTheCinema(int nVal)
 {
-    UnMaskStatus();
-
     switch (nVal - 1)
     {
         default:
@@ -1292,7 +1288,6 @@ void GoToTheCinema(int nVal)
     videoNextPage();
 
     GrabPalette();
-    Clip();
 
     // quit the game if we've finished level 4 and displayed the advert text
     if (ISDEMOVER && nVal == 3) {
@@ -1430,7 +1425,6 @@ void DoStatic(int a, int b)
 void DoLastLevelCinema()
 {
     FadeOut(0);
-    UnMaskStatus();
 
     videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
 
@@ -1592,8 +1586,6 @@ LABEL_28:
     EraseScreen(-1);
     tileLoad(kTileLoboLaptop);
     FadeOut(0);
-    MySetView(nViewLeft, nViewTop, nViewRight, nViewBottom);
-    MaskStatus();
 }
 
 static SavegameHelper sgh("menu",
diff --git a/source/exhumed/src/sequence.cpp b/source/exhumed/src/sequence.cpp
index 1afc45aa3..5f53bb759 100644
--- a/source/exhumed/src/sequence.cpp
+++ b/source/exhumed/src/sequence.cpp
@@ -43,7 +43,6 @@ short nPilotLightFrame;
 short nPilotLightCount;
 
 short nPilotLightBase;
-short laststatustile;
 
 short nShadowWidth = 1;
 short nFlameHeight = 1;
@@ -349,47 +348,6 @@ void seq_LoadSequences()
     }
 }
 
-void seq_DrawStatusSequence(short nSequence, uint16_t edx, short ebx)
-{
-    edx += SeqBase[nSequence];
-
-    short nFrameBase = FrameBase[edx];
-    int16_t nFrameSize = FrameSize[edx];
-
-    int const nPal = RemapPLU(kPalNormal);
-
-    while (1)
-    {
-        nFrameSize--;
-        if (nFrameSize < 0)
-            break;
-
-        uint8_t nStat = 1; // (thex, they) is middle
-
-        laststatusx = ChunkXpos[nFrameBase] + 160;
-        laststatusy = ChunkYpos[nFrameBase] + 100 + ebx;
-
-        short chunkFlag = ChunkFlag[nFrameBase];
-
-        if (chunkFlag & 1) {
-            nStat = 0x9; // (thex, they) is middle, and x-flipped
-        }
-
-        if (chunkFlag & 2) {
-            nStat |= 0x10; // y-flipped
-        }
-
-        laststatustile = ChunkPict[nFrameBase];
-
-        if (bHiRes) {
-            nStat |= 0x2; // scale and clip to viewing window
-        }
-
-        overwritesprite(laststatusx, laststatusy, laststatustile, 0, nStat, nPal);
-        nFrameBase++;
-    }
-}
-
 short seq_GetFrameFlag(short val, short nFrame)
 {
     return FrameFlag[SeqBase[val] + nFrame];
@@ -677,7 +635,6 @@ static SavegameHelper sgh("sequence",
     SV(nPilotLightFrame),
     SV(nPilotLightCount),
     SV(nPilotLightBase),
-    SV(laststatustile),
     SV(nShadowWidth),
     SV(nFlameHeight),
     nullptr);
diff --git a/source/exhumed/src/sequence.h b/source/exhumed/src/sequence.h
index a6a306e16..79d698d1d 100644
--- a/source/exhumed/src/sequence.h
+++ b/source/exhumed/src/sequence.h
@@ -124,11 +124,17 @@ extern short nFlameHeight;
 extern short nPilotLightFrame;
 extern short nPilotLightCount;
 
-extern short laststatustile;
-
 extern int laststatusx;
 extern int laststatusy;
 
+extern short ChunkYpos[];
+extern short ChunkXpos[];
+extern short ChunkPict[];
+extern short ChunkFlag[];
+extern short FrameSize[];
+extern short FrameBase[];
+
+
 void seq_LoadSequences();
 int seq_GetFrameSound(int val, int edx);
 void seq_MoveSequence(short nSprite, short nSeq, short bx);
diff --git a/source/exhumed/src/snake.cpp b/source/exhumed/src/snake.cpp
index 57f79e061..ab6285a01 100644
--- a/source/exhumed/src/snake.cpp
+++ b/source/exhumed/src/snake.cpp
@@ -88,9 +88,6 @@ void DestroySnake(int nSnake)
     if (nSnake == nSnakeCam)
     {
         nSnakeCam = -1;
-        if (!bFullScreen) {
-            RefreshStatus();
-        }
     }
 }
 
diff --git a/source/exhumed/src/status.cpp b/source/exhumed/src/status.cpp
index c065b9677..0ef460861 100644
--- a/source/exhumed/src/status.cpp
+++ b/source/exhumed/src/status.cpp
@@ -24,6 +24,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sequence.h"
 #include "names.h"
 #include "view.h"
+#include "v_2ddrawer.h"
+#include "multipatchtexture.h"
+#include "texturemanager.h"
+#include "statusbar.h"
+#include "v_draw.h"
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -31,6 +36,107 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_PS_NS
 
+
+void InitFonts()
+{
+    GlyphSet fontdata;
+    fontdata.Insert(127, TexMan.FindGameTexture("TINYBLAK")); // this is only here to widen the color range of the font to produce a better translation.
+
+    auto tile = tileGetTexture(159);
+    auto pixels = tile->GetTexture()->Get8BitPixels(false);
+    // Convert the sheet font to a proportional font by checking the actual character sizes.
+    for (int i = 1; i < 128; i++)
+    {
+        int xpos = (i % 16) * 8;
+        int ypos = (i / 16) * 8;
+        bool rowset[8]{};
+        for (int x = 0; x < 8; x++)
+        {
+            for (int y = 0; y < 8; y++)
+            {
+                int pixel = pixels[xpos + x + 128 * (ypos + y)];
+                if (pixel)
+                {
+                    rowset[x] = true;
+                    break;
+                }
+            }
+        }
+        int left = 0;
+        int right = 7;
+        while (left <= right)
+        {
+            bool didit = false;
+            if (!rowset[left]) left++, didit = true;
+            if (!rowset[right]) right--, didit = true;
+            if (!didit) break;
+        }
+        if (left < right)
+        {
+            xpos += left;
+            int width = right - left + 1;
+            int height = 8;
+
+            TArray<TexPartBuild> part(1, true);
+            part[0].OriginX = -xpos;
+            part[0].OriginY = -ypos;
+            part[0].TexImage = static_cast<FImageTexture*>(tile->GetTexture());
+            FMultiPatchTexture* image = new FMultiPatchTexture(width, height, part, false, false);
+            FImageTexture* tex = new FImageTexture(image);
+            auto gtex = MakeGameTexture(tex, nullptr, ETextureType::FontChar);
+            gtex->SetWorldPanning(true);
+            gtex->SetOffsets(0, 0, 0);
+            gtex->SetOffsets(1, 0, 0);
+            TexMan.AddGameTexture(gtex);
+            fontdata.Insert(i, gtex);
+        }
+    }
+    SmallFont2 = new ::FFont("SmallFont2", nullptr, "defsmallfont2", 0, 0, 0, -1, 4, false, false, false, &fontdata);
+    SmallFont2->SetKerning(1);
+    fontdata.Clear();
+
+    for (int i = 0; i < 26; i++)
+    {
+        fontdata.Insert('A' + i, tileGetTexture(3522 + i));
+    }
+    for (int i = 0; i < 10; i++)
+    {
+        fontdata.Insert('0' + i, tileGetTexture(3555 + i));
+    }
+    fontdata.Insert('.', tileGetTexture(3548));
+    fontdata.Insert('!', tileGetTexture(3549));
+    fontdata.Insert('?', tileGetTexture(3550));
+    fontdata.Insert(',', tileGetTexture(3551));
+    fontdata.Insert('`', tileGetTexture(3552));
+    fontdata.Insert('"', tileGetTexture(3553));
+    fontdata.Insert('-', tileGetTexture(3554));
+    fontdata.Insert('_', tileGetTexture(3554));
+    fontdata.Insert(127, TexMan.FindGameTexture("TINYBLAK")); // this is only here to widen the color range of the font to produce a better translation.
+    GlyphSet::Iterator it(fontdata);
+    GlyphSet::Pair* pair;
+    while (it.NextPair(pair)) pair->Value->SetOffsetsNotForFont();
+    SmallFont = new ::FFont("SmallFont", nullptr, "defsmallfont", 0, 0, 0, -1, 4, false, false, false, &fontdata);
+    SmallFont->SetKerning(1);
+    fontdata.Clear();
+
+}
+
+
+// All this must be moved into the status bar once it is made persistent!
+const int kMaxStatusAnims = 50;
+
+short word_9AD54[kMaxPlayers] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+int dword_9AD64[kMaxPlayers] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+short nStatusSeqOffset;
+short nHealthFrames;
+short nMagicFrames;
+
+short nHealthLevel;
+short nMagicLevel;
+short nHealthFrame;
+short nMagicFrame;
+
 short nMaskY;
 static short nAnimsFree = 0;
 
@@ -45,26 +151,16 @@ int nAirFrames;
 int nCounter;
 int nCounterDest;
 
-short nStatusSeqOffset;
 short nItemFrames;
 
-int laststatusx;
-int laststatusy;
-
 int16_t nItemSeq;
 short nDigit[3];
 
-short nMagicFrames;
-short nHealthLevel;
 short nItemFrame;
 short nMeterRange;
-short nMagicLevel;
-short nHealthFrame;
-short nMagicFrame;
 
 short statusx;
 short statusy;
-short nHealthFrames;
 
 short airframe;
 
@@ -89,7 +185,6 @@ struct statusAnim
     int8_t nNextAnim;
 };
 
-#define kMaxStatusAnims		50
 
 statusAnim StatusAnim[kMaxStatusAnims];
 uint8_t StatusAnimsFree[kMaxStatusAnims];
@@ -97,15 +192,50 @@ uint8_t StatusAnimFlags[kMaxStatusAnims];
 
 short nItemSeqOffset[] = {91, 72, 76, 79, 68, 87, 83};
 
-short word_9AD54[kMaxPlayers] = {0, 0, 0, 0, 0, 0, 0, 0};
-int dword_9AD64[kMaxPlayers] = {0, 0, 0, 0, 0, 0, 0, 0};
-
 void SetCounterDigits();
 void SetItemSeq();
 void SetItemSeq2(int nSeqOffset);
 void DestroyStatusAnim(short nAnim);
 
 
+void InitStatus()
+{
+    nStatusSeqOffset = SeqOffsets[kSeqStatus];
+    nHealthFrames = SeqSize[nStatusSeqOffset + 1];
+    int nPicNum = seq_GetSeqPicnum(kSeqStatus, 1, 0);
+    nMagicFrames = SeqSize[nStatusSeqOffset + 129];
+    nHealthFrame = 0;
+    nMagicFrame = 0;
+    nHealthLevel = 0;
+    nMagicLevel = 0;
+    nMeterRange = tilesiz[nPicNum].y;
+    magicperline = 1000 / nMeterRange;
+    healthperline = 800 / nMeterRange;
+    nAirFrames = SeqSize[nStatusSeqOffset + 133];
+    airperline = 100 / nAirFrames;
+    nCounter = 0;
+    nCounterDest = 0;
+
+    memset(nDigit, 0, sizeof(nDigit));
+
+    SetCounter(0);
+    SetHealthFrame(0);
+    SetMagicFrame();
+
+    for (int i = 0; i < kMaxStatusAnims; i++) {
+        StatusAnimsFree[i] = i;
+    }
+
+    nLastAnim = -1;
+    nFirstAnim = -1;
+    nItemSeq = -1;
+    nAnimsFree = kMaxStatusAnims;
+    statusx = xdim - 320;
+    message_timer = 0;
+    statusy = ydim - 200;
+}
+
+
 int BuildStatusAnim(int val, int nFlags)
 {
     // destroy this anim if it already exists
@@ -147,7 +277,8 @@ void RefreshStatus()
 {
     short nLives = nPlayerLives[nLocalPlayer];
     if (nLives < 0 || nLives > kMaxPlayerLives) {
-        I_Error("illegal value for nPlayerLives #%d\n", nLocalPlayer);
+        //Error("illegal value for nPlayerLives #%d\n", nLocalPlayer);
+        nLives = 0;
     }
 
     // draws the red dots that indicate the lives amount
@@ -173,44 +304,6 @@ void RefreshStatus()
     SetAirFrame();
 }
 
-void InitStatus()
-{
-    nStatusSeqOffset = SeqOffsets[kSeqStatus];
-    nHealthFrames = SeqSize[nStatusSeqOffset + 1];
-    int nPicNum   = seq_GetSeqPicnum(kSeqStatus, 1, 0);
-    nMagicFrames  = SeqSize[nStatusSeqOffset + 129];
-    nHealthFrame  = 0;
-    nMagicFrame   = 0;
-    nHealthLevel  = 0;
-    nMagicLevel   = 0;
-    nMeterRange   = tilesiz[nPicNum].y;
-    magicperline  = 1000 / nMeterRange;
-    healthperline = 800 / nMeterRange;
-    nAirFrames = SeqSize[nStatusSeqOffset + 133];
-    airperline = 100 / nAirFrames;
-    nCounter   = 0;
-    nCounterDest = 0;
-
-    memset(nDigit, 0, sizeof(nDigit));
-
-    SetCounter(0);
-    SetHealthFrame(0);
-    SetMagicFrame();
-
-    for (int i = 0; i < kMaxStatusAnims; i++) {
-        StatusAnimsFree[i] = i;
-    }
-
-    nLastAnim  = -1;
-    nFirstAnim = -1;
-    nItemSeq   = -1;
-    nAnimsFree = kMaxStatusAnims;
-    statusx    = xdim - 320;
-    textpages  = 0;
-    message_timer = 0;
-    statusy = ydim - 200;
-}
-
 void MoveStatusAnims()
 {
     for (int i = nFirstAnim; i >= 0; i = StatusAnim[i].nPrevAnim)
@@ -258,29 +351,6 @@ void DestroyStatusAnim(short nAnim)
     nAnimsFree++;
 }
 
-void DrawStatusAnims()
-{
-    for (int i = nFirstAnim; i >= 0; i = StatusAnim[i].nPrevAnim)
-    {
-        int nSequence = nStatusSeqOffset + StatusAnim[i].s1;
-
-        //seq_DrawStatusSequence(nSequence, StatusAnim[i].s2, 0);
-
-/*
-        if (StatusAnim[nAnim].s2 >= (SeqSize[nSequence] - 1))
-        {
-            if (!(StatusAnimFlags[nAnim] & 0x10))
-            {
-                StatusAnim[nAnim].nPage--;
-                if (StatusAnim[nAnim].nPage <= 0) {
-                    DestroyStatusAnim(nAnim);
-                }
-            }
-        }
-*/
-    }
-}
-
 void SetMagicFrame()
 {
     nMagicLevel = (1000 - PlayerList[nLocalPlayer].nMagic) / magicperline;
@@ -483,10 +553,6 @@ void MoveStatus()
         message_timer -= 4;
         if (message_timer <= 0)
         {
-            if (screensize > 0) {
-                textpages = numpages;
-            }
-
             message_timer = 0;
         }
     }
@@ -584,269 +650,336 @@ void MoveStatus()
     }
 }
 
-void UnMaskStatus()
-{
-#if 0
-    for (int i = 0; i < xdim; i++) {
-        startdmost[i] = ydim;
-    }
-#endif
-}
-
-void MaskStatus()
-{
-#if 0
-    for (int i = 0; i < xdim; i++)
-    {
-        short bx = startdmost[i];
-        short cx = statusmask[i];
-
-        if (bx > cx) {
-            startdmost[i] = cx;
-        }
-    }
-#endif
-}
-
-void LoadStatus()
-{
-#if 0
-    int i;
-    short nSize;
-    short tmp;
-    short buffer[1024];
-//	memset(buffer, 0, sizeof(buffer)); // bjd - added by me
-
-    for (i = 0; i < xdim; i++) {
-        statusmask[i] = ydim;
-    }
-
-    nMaskY = ydim;
-
-    int hStatus = kopen4load("status.msk", 1);
-    if (!hStatus) {
-        return;
-    }
-
-    kread(hStatus, &nSize, sizeof(nSize));
-
-    int nCount = nSize >> 1;
-
-    kread(hStatus, &tmp, sizeof(tmp));
-    kread(hStatus, buffer, nSize);
-
-    kclose(hStatus);
-
-    short *pStatusMask = statusmask;
-
-    for (i = 0; i < nCount; i++)
-    {
-        int v8 = ydim - ((ydim * buffer[i]) / 200);
-        *pStatusMask++ = ydim - v8;
-
-        if (bHiRes) {
-            *pStatusMask++ = ydim - v8;
-        }
-
-        if (ydim - v8 < nMaskY) {
-            nMaskY = ydim - v8;
-        }
-    }
-#endif
-}
-
-void StatusMessage(int messageTime, const char *fmt, ...)
-{
-    message_timer = messageTime;
-
-    va_list args;
-    va_start(args, fmt);
-
-    vsprintf(message_text, fmt, args);
-
-    if (screensize > 0) {
-        textpages = numpages;
-    }
-}
 
 void DrawSnakeCamStatus()
 {
     printext(0, 0, "S E R P E N T   C A M", kTile159, 255);
 }
 
-void DrawStatus()
+class DExhumedStatusBar : public DBaseStatusBar
 {
-    char numberBuf[10] = {0};
-    char stringBuf[20] = {0};
-    char coordBuf[50] = {0}; // not sure of the size for this?
+    DHUDFont textfont;
 
-    if (!bFullScreen && nNetTime)
+public:
+    DExhumedStatusBar()
     {
-        // bjd - commenting out this check seems to fix the black status bar at 320x200 resolution
-//		if (bHiRes) {
-            NoClip();
-//		}
-
-        // draw the main bar itself
-        seq_DrawStatusSequence(nStatusSeqOffset, 0, 0);
-
-        seq_DrawStatusSequence(nStatusSeqOffset + 128, 0, 0);
-        seq_DrawStatusSequence(nStatusSeqOffset + 127, 0, 0);
-        seq_DrawStatusSequence(nStatusSeqOffset + 1, nHealthFrame, nHealthLevel);
-        seq_DrawStatusSequence(nStatusSeqOffset + 129, nMagicFrame, nMagicLevel);
-        seq_DrawStatusSequence(nStatusSeqOffset + 125, 0, 0); // draw ankh on health pool
-        seq_DrawStatusSequence(nStatusSeqOffset + 130, 0, 0); // draw health pool frame (top)
-        seq_DrawStatusSequence(nStatusSeqOffset + 131, 0, 0); // magic pool frame (bottom)
-
-        if (nItemSeq >= 0) {
-            seq_DrawStatusSequence(nItemSeq + nStatusSeqOffset, nItemFrame, 0);
-        }
-
-        // draws health level dots, animates breathing lungs and other things
-        DrawStatusAnims();
-
-        // draw the blue air level meter when underwater (but not responsible for animating the breathing lungs otherwise)
-        if (airpages)
-        {
-            seq_DrawStatusSequence(nStatusSeqOffset + 133, airframe, 0);
-            // airpages--;
-        }
-
-        // draw compass
-        seq_DrawStatusSequence(nStatusSeqOffset + 35, ((inita + 128) & kAngleMask) >> 8, 0);
-
-        /*
-        if (bCoordinates)
-        {
-            sprintf(numberBuf, "%i", lastfps);
-            // char *cFPS = itoa(lastfps, numberBuf, 10);
-            printext(xdim - 20, nViewTop, numberBuf, kTile159, -1);
-        }
-        */
-
-        // draw ammo count
-        seq_DrawStatusSequence(nStatusSeqOffset + 44, nDigit[2], 0);
-        seq_DrawStatusSequence(nStatusSeqOffset + 45, nDigit[1], 0);
-        seq_DrawStatusSequence(nStatusSeqOffset + 46, nDigit[0], 0);
-
-        // bjd - commenting out this check seems to fix the black status bar at 320x200 resolution
-//		if (bHiRes) {
-            Clip();
-//		}
+        textfont = { SmallFont2, 1, Off, 1, 1 };
     }
 
-    if (nNetPlayerCount)
+private:
+
+    //---------------------------------------------------------------------------
+    //
+    // draws a sequence animation to the status bar
+    //
+    //---------------------------------------------------------------------------
+
+    void DrawStatusSequence(short nSequence, uint16_t edx, short ebx, int xoffset = 0)
     {
-        NoClip();
+        edx += SeqBase[nSequence];
 
-        int shade;
+        short nFrameBase = FrameBase[edx];
+        int16_t nFrameSize = FrameSize[edx];
 
-        if ((int)totalclock / kTimerTicks & 1) {
-            shade = -100;
-        }
-        else {
-            shade = 127;
-        }
-
-        int nTile = kTile3593;
-
-        int x = 320 / (nTotalPlayers + 1);
-
-        for (int i = 0; i < nTotalPlayers; i++)
+        while (1)
         {
-            int nScore = nPlayerScore[i];
-            if (word_9AD54[i] == nScore)
+            nFrameSize--;
+            if (nFrameSize < 0)
+                break;
+
+            int flags = DI_ITEM_RELCENTER;
+
+            int x = ChunkXpos[nFrameBase];
+            int y = ChunkYpos[nFrameBase] + ebx;
+
+            if (hud_size <= Hud_StbarOverlay)
             {
-                int v9 = dword_9AD64[i];
-                if (v9 && v9 <= (int)totalclock) {
-                    dword_9AD64[i] = 0;
-                }
+                x += 160;
+                y += 100;
             }
             else
             {
-                word_9AD54[i] = nScore;
-                dword_9AD64[i] = (int)totalclock + 30;
+                if (x < 0)
+                {
+                    x += 160;
+                    flags |= DI_SCREEN_LEFT_BOTTOM;
+                }
+                else if (x > 0)
+                {
+                    x -= 159; // graphics do not match up precisely.
+                    flags |= DI_SCREEN_RIGHT_BOTTOM;
+                }
+                y -= 100;
+                if (hud_size == Hud_full)
+                {
+                    x += xoffset;
+                }
             }
 
-            overwritesprite(x, 7, nTile, 0, 3, kPalNormal);
+            int tile = ChunkPict[nFrameBase];
 
-            if (i != nLocalPlayer) {
+            short chunkFlag = ChunkFlag[nFrameBase];
+
+            if (chunkFlag & 1) flags |= DI_MIRROR;
+            if (chunkFlag & 2) flags |= DI_MIRRORY;
+
+            DrawGraphic(tileGetTexture(tile), x, y, flags, 1, -1, -1, 1, 1);
+            //overwritesprite(x, y, tile, 0, nStat, 0);
+            nFrameBase++;
+        }
+    }
+
+    //---------------------------------------------------------------------------
+    //
+    // 
+    //
+    //---------------------------------------------------------------------------
+
+    void DrawStatusAnims()
+    {
+        for (int i = nFirstAnim; i >= 0; i = StatusAnim[i].nPrevAnim)
+        {
+            int nSequence = nStatusSeqOffset + StatusAnim[i].s1;
+
+            int xoffs = 0;
+            if (StatusAnim[i].s1 == 132) xoffs = -32;
+
+            DrawStatusSequence(nSequence, StatusAnim[i].s2, 0, xoffs);
+
+            /*
+                    if (StatusAnim[nAnim].s2 >= (SeqSize[nSequence] - 1))
+                    {
+                        if (!(StatusAnimFlags[nAnim] & 0x10))
+                        {
+                            StatusAnim[nAnim].nPage--;
+                            if (StatusAnim[nAnim].nPage <= 0) {
+                                DestroyStatusAnim(nAnim);
+                            }
+                        }
+                    }
+            */
+        }
+    }
+
+
+    //---------------------------------------------------------------------------
+    //
+    // Frag display - very ugly and may have to be redone if multiplayer suppoer gets added.
+    //
+    //---------------------------------------------------------------------------
+
+    void DrawMulti()
+    {
+        char stringBuf[30];
+        if (nNetPlayerCount)
+        {
+            BeginHUD(320, 200, 1);
+
+            int shade;
+
+            if ((int)totalclock / kTimerTicks & 1) {
                 shade = -100;
             }
+            else {
+                shade = 127;
+            }
 
-            sprintf(stringBuf, "%d", nPlayerScore[i]);
-            int nStringLen = MyGetStringWidth(stringBuf);
+            int nTile = kTile3593;
 
-            myprintext(x - (nStringLen / 2), 4, stringBuf, shade);
+            int xx = 320 / (nTotalPlayers + 1);
+            int x = xx - 160;
 
-            x *= 2;
-            nTile++;
-        }
-
-        if (nNetTime >= 0)
-        {
-            int y = nViewTop;
-
-            if (nNetTime)
+            for (int i = 0; i < nTotalPlayers; i++)
             {
-                int v12 = (nNetTime + 29) / 30 % 60;
-                int v13 = (nNetTime + 29) / 1800;
-                nNetTime += 29;
-
-                sprintf(stringBuf, "%d.%02d", v13, v12);
-
-                if (bHiRes) {
-                    y = nViewTop / 2;
+                int nScore = nPlayerScore[i];
+                if (word_9AD54[i] == nScore)
+                {
+                    int v9 = dword_9AD64[i];
+                    if (v9 && v9 <= (int)totalclock) {
+                        dword_9AD64[i] = 0;
+                    }
+                }
+                else
+                {
+                    word_9AD54[i] = nScore;
+                    dword_9AD64[i] = (int)totalclock + 30;
                 }
 
-                if (nViewTop <= 0) {
+                DrawGraphic(tileGetTexture(nTile), x, 7, DI_ITEM_TOP|DI_MIRROR|DI_MIRRORY, 1, -1, -1, 1, 1);
+
+                if (i != nLocalPlayer) {
+                    shade = -100;
+                }
+
+                sprintf(stringBuf, "%d", nPlayerScore[i]);
+                SBar_DrawString(this, &textfont, stringBuf, x, 0, DI_ITEM_TOP|DI_TEXT_ALIGN_CENTER, i != nLocalPlayer ? CR_UNTRANSLATED : CR_GOLD, 1, -1, 0, 1, 1);
+                x += xx;
+                nTile++;
+            }
+
+            if (nNetTime >= 0)
+            {
+                int y = 0;
+
+                if (nNetTime)
+                {
+                    int v12 = (nNetTime + 29) / 30 % 60;
+                    int v13 = (nNetTime + 29) / 1800;
+                    nNetTime += 29;
+
+                    sprintf(stringBuf, "%d.%02d", v13, v12);
+
                     y += 20;
+                    nNetTime -= 29;
+                    SBar_DrawString(this, &textfont, stringBuf, 0, 10, DI_ITEM_TOP | DI_TEXT_ALIGN_LEFT, CR_UNTRANSLATED, 1, -1, 0, 1, 1);
                 }
-                else {
-                    y += 15;
-                }
-
-                nNetTime -= 29;
-            }
-            else
-            {
-                y = 100;
-                strcpy(stringBuf, "GAME OVER");
             }
 
-            int nLenString = MyGetStringWidth(stringBuf);
-            myprintext((320 - nLenString) / 2, y, stringBuf, 0);
+        }
+    }
+
+    //---------------------------------------------------------------------------
+    //
+    // draw the full status bar
+    //
+    //---------------------------------------------------------------------------
+
+    void DrawStatus()
+    {
+        BeginStatusBar(320, 200, 40);
+        char numberBuf[10] = { 0 };
+        char stringBuf[20] = { 0 };
+        char coordBuf[50] = { 0 }; // not sure of the size for this?
+
+        if (hud_size <= Hud_StbarOverlay)
+        {
+            // draw the main bar itself
+            BeginStatusBar(320, 200, 40);
+            DrawStatusSequence(nStatusSeqOffset, 0, 0);
+        }
+        else if (hud_size == Hud_Mini)
+        {
+            auto lh = TexMan.GetGameTextureByName("hud_l");
+            auto rh = TexMan.GetGameTextureByName("hud_r");
+            BeginHUD(320, 200, 1);
+            if (lh) DrawGraphic(lh, 0, 0, DI_ITEM_LEFT_BOTTOM | DI_SCREEN_LEFT_BOTTOM, 1, -1, -1, 1, 1);
+            if (rh) DrawGraphic(rh, 0, 0, DI_ITEM_RIGHT_BOTTOM | DI_SCREEN_RIGHT_BOTTOM, 1, -1, -1, 1, 1);
+        }
+        else if (hud_size == Hud_full)
+        {
+            BeginHUD(320, 200, 1);
         }
 
-        Clip();
-    }
+        if (/*!bFullScreen &&*/ nNetTime)
+        {
+            DrawStatusSequence(nStatusSeqOffset + 127, 0, 0, -4);
+            DrawStatusSequence(nStatusSeqOffset + 129, nMagicFrame, nMagicLevel, -4);
+            DrawStatusSequence(nStatusSeqOffset + 131, 0, 0, -4); // magic pool frame (bottom)
 
-    if (bCoordinates)
-    {
-        int nSprite = PlayerList[nLocalPlayer].nSprite;
+            DrawStatusSequence(nStatusSeqOffset + 128, 0, 0, 4);
+            DrawStatusSequence(nStatusSeqOffset + 1, nHealthFrame, nHealthLevel, 4);
+            DrawStatusSequence(nStatusSeqOffset + 125, 0, 0, 4); // draw ankh on health pool
+            DrawStatusSequence(nStatusSeqOffset + 130, 0, 0, 4); // draw health pool frame (top)
 
-        int x = (nViewLeft + nViewRight) / 2;
+            if (nItemSeq >= 0) {
+                DrawStatusSequence(nItemSeq + nStatusSeqOffset, nItemFrame, 0);
+            }
+            // draw the blue air level meter when underwater (but not responsible for animating the breathing lungs otherwise)
+            DrawStatusSequence(nStatusSeqOffset + 133, airframe, 0, -32);
 
-        snprintf(coordBuf, 50, "X %d", (int)sprite[nSprite].x);
-        printext(x, nViewTop + 1, coordBuf, kTile159, 255);
+            // draws health level dots, animates breathing lungs and other things
+            DrawStatusAnims();
 
-        snprintf(coordBuf, 50, "Y %d", sprite[nSprite].y);
-        printext(x, nViewTop + 10, coordBuf, kTile159, 255);
-    }
 
-    if (bHolly)
-    {
-        snprintf(message_text, 80, "HOLLY: %s", sHollyStr);
-        printext(0, 0, message_text, kTile159, 255);
-    }
-    else if (nSnakeCam < 0)
-    {
-        if (message_timer) {
+            // draw compass
+            if (hud_size <= Hud_StbarOverlay) DrawStatusSequence(nStatusSeqOffset + 35, ((inita + 128) & kAngleMask) >> 8, 0);
+
+            //if (hud_size < Hud_full)
+            {
+                // draw ammo count
+                DrawStatusSequence(nStatusSeqOffset + 44, nDigit[2], 0, -35);
+                DrawStatusSequence(nStatusSeqOffset + 45, nDigit[1], 0, -35);
+                DrawStatusSequence(nStatusSeqOffset + 46, nDigit[0], 0, -35);
+            }
+        }
+
+        DrawMulti();
+
+#if 0
+        if (bCoordinates)
+        {
+            int nSprite = PlayerList[nLocalPlayer].nSprite;
+
+            int x = 160;
+
+            snprintf(coordBuf, 50, "X %d", (int)sprite[nSprite].x);
+            printext(x, 1, coordBuf, kTile159, 255);
+
+            snprintf(coordBuf, 50, "Y %d", sprite[nSprite].y);
+            printext(x, 10, coordBuf, kTile159, 255);
+        }
+
+        if (bHolly)
+        {
+            snprintf(message_text, 80, "HOLLY: %s", sHollyStr);
             printext(0, 0, message_text, kTile159, 255);
         }
+        else if (nSnakeCam < 0)
+        {
+            if (message_timer) {
+                printext(0, 0, message_text, kTile159, 255);
+            }
+        }
+#endif
     }
+
+public:
+    void Draw()
+    {
+        if (hud_size <= Hud_full)
+        {
+            DrawStatus();
+        }
+    }
+};
+
+void UpdateFrame()
+{
+    auto tex = tileGetTexture(nBackgroundPic);
+
+    twod->AddFlatFill(0, 0, xdim, windowxy1.y - 3, tex);
+    twod->AddFlatFill(0, windowxy2.y + 4, xdim, ydim, tex);
+    twod->AddFlatFill(0, windowxy1.y - 3, windowxy1.x - 3, windowxy2.y + 4, tex);
+    twod->AddFlatFill(windowxy2.x + 4, windowxy1.y - 3, xdim, windowxy2.y + 4, tex);
+
+    twod->AddFlatFill(windowxy1.x - 3, windowxy1.y - 3, windowxy1.x, windowxy2.y + 1, tex, 0, 1, 0xff545454);
+    twod->AddFlatFill(windowxy1.x, windowxy1.y - 3, windowxy2.x + 4, windowxy1.y, tex, 0, 1, 0xff545454);
+    twod->AddFlatFill(windowxy2.x + 1, windowxy1.y, windowxy2.x + 4, windowxy2.y + 4, tex, 0, 1, 0xff2a2a2a);
+    twod->AddFlatFill(windowxy1.x - 3, windowxy2.y + 1, windowxy2.x + 1, windowxy2.y + 4, tex, 0, 1, 0xff2a2a2a);
 }
 
+void StatusMessage(int messageTime, const char* fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    VPrintf(PRINT_NOTIFY, fmt, ap);
+    Printf(PRINT_NOTIFY, "\n");
+    va_end(ap);
+}
+
+
+void DrawStatusBar()
+{
+    if (hud_size <= Hud_Stbar)
+    {
+        UpdateFrame();
+    }
+    DExhumedStatusBar sbar;
+    sbar.Draw();
+}
+
+
+#if 0
 // I'm not sure this really needs to be saved.
 static SavegameHelper sgh("status",
     SV(nMaskY),
@@ -858,7 +991,6 @@ static SavegameHelper sgh("status",
     SV(nAirFrames),
     SV(nCounter),
     SV(nCounterDest),
-    SV(nStatusSeqOffset),
     SV(nItemFrames),
     SV(laststatusx),
     SV(laststatusy),
@@ -872,7 +1004,6 @@ static SavegameHelper sgh("status",
     SV(nMagicFrame),
     SV(statusx),
     SV(statusy),
-    SV(nHealthFrames),
     SV(airframe),
     SV(nFirstAnim),
     SV(nLastAnim),
@@ -887,9 +1018,7 @@ static SavegameHelper sgh("status",
     SA(StatusAnimsFree),
     SA(StatusAnimFlags),
     SA(nItemSeqOffset),
-    SA(word_9AD54),
-    SA(dword_9AD64),
     nullptr);
-
+#endif
 
 END_PS_NS
diff --git a/source/exhumed/src/status.h b/source/exhumed/src/status.h
index d0d261364..06fe1385a 100644
--- a/source/exhumed/src/status.h
+++ b/source/exhumed/src/status.h
@@ -28,9 +28,6 @@ extern short airpages;
 
 void RefreshStatus();
 void InitStatus();
-void UnMaskStatus();
-void MaskStatus();
-void LoadStatus();
 void SetPlayerItem(short nPlayer, short nItem);
 void SetMagicFrame();
 void SetHealthFrame(short nVal);
diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp
index bd2e9e773..bca8e575a 100644
--- a/source/exhumed/src/view.cpp
+++ b/source/exhumed/src/view.cpp
@@ -42,6 +42,7 @@ int nCamerax;
 int nCameray;
 int nCameraz;
 
+
 short bTouchFloor;
 
 short nQuake[kMaxPlayers] = { 0 };
@@ -51,15 +52,8 @@ short nChunkTotal = 0;
 fix16_t nCameraa;
 fix16_t nCamerapan;
 short nViewTop;
-short bClip = false;
-short nViewBottom;
-short nViewRight;
-short besttarget;
-short nViewLeft;
 short bCamera = false;
 
-short nViewy;
-
 int viewz;
 
 short enemy;
@@ -128,10 +122,7 @@ void viewRestoreInterpolations(void)  //Stick at end of drawscreen
 
 void InitView()
 {
-    screensize = 0;
-#ifdef USE_OPENGL
     polymostcenterhoriz = 92;
-#endif
 }
 
 // NOTE - not to be confused with Ken's analyzesprites()
@@ -237,86 +228,12 @@ void ResetView()
 #ifdef USE_OPENGL
     videoTintBlood(0, 0, 0);
 #endif
-
-    LoadStatus();
 }
 
 void SetView1()
 {
 }
 
-void RefreshBackground()
-{
-    if (screensize <= 0)
-        return;
-    int nTileOffset = 0;
-    int tileX = tilesiz[nBackgroundPic].x;
-    int tileY = tilesiz[nBackgroundPic].y;
-
-    videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
-
-    MaskStatus();
-
-    for (int y = 0; y < nViewTop; y += tileY)
-    {
-        nTileOffset = (y/tileY)&1;
-        for (int x = 0; x < xdim; x += tileX)
-        {
-            rotatesprite(x<<16, y<<16, 65536L, 0, nBackgroundPic + nTileOffset, -32, kPalNormal, 8 + 16 + 64, 0, 0, xdim-1, nViewTop-1);
-            nTileOffset ^= 1;
-        }
-    }
-    for (int y = (nViewTop/tileY)*tileY; y <= nViewBottom; y += tileY)
-    {
-        nTileOffset = (y/tileY)&1;
-        for (int x = 0; x < nViewLeft; x += tileX)
-        {
-            rotatesprite(x<<16, y<<16, 65536L, 0, nBackgroundPic + nTileOffset, -32, kPalNormal, 8 + 16 + 64, 0, nViewTop, nViewLeft-1, nViewBottom);
-            nTileOffset ^= 1;
-        }
-    }
-    for (int y = (nViewTop/tileY)*tileY; y <= nViewBottom; y += tileY)
-    {
-        nTileOffset = ((y/tileY)^((nViewRight+1)/tileX))&1;
-        for (int x = ((nViewRight+1)/tileX)*tileX; x < xdim; x += tileX)
-        {
-            rotatesprite(x<<16, y<<16, 65536L, 0, nBackgroundPic + nTileOffset, -32, kPalNormal, 8 + 16 + 64, nViewRight+1, nViewTop, xdim-1, nViewBottom);
-            nTileOffset ^= 1;
-        }
-    }
-    for (int y = ((nViewBottom+1)/tileY)*tileY; y < ydim; y += tileY)
-    {
-        nTileOffset = (y/tileY)&1;
-        for (int x = 0; x < xdim; x += tileX)
-        {
-            rotatesprite(x<<16, y<<16, 65536L, 0, nBackgroundPic + nTileOffset, -32, kPalNormal, 8 + 16 + 64, 0, nViewBottom+1, xdim-1, ydim-1);
-            nTileOffset ^= 1;
-        }
-    }
-
-    videoSetViewableArea(nViewLeft, nViewTop, nViewRight, nViewBottom);
-}
-
-void MySetView(int x1, int y1, int x2, int y2)
-{
-    if (!bFullScreen) {
-        MaskStatus();
-    }
-
-    nViewLeft = x1;
-    nViewTop = y1;
-    nViewRight = x2;
-    nViewBottom = y2;
-
-    videoSetViewableArea(x1, y1, x2, y2);
-
-    nViewy = y1;
-}
-
-// unused function
-void TestLava()
-{
-}
 
 static inline int interpolate16(int a, int b, int smooth)
 {
@@ -332,16 +249,6 @@ void DrawView(int smoothRatio, bool sceneonly)
     fix16_t nAngle;
     fix16_t pan;
 
-
-    if (!sceneonly)
-    {
-        RefreshBackground();
-
-        if (!bFullScreen) {
-            MaskStatus();
-        }
-    }
-
     zbob = Sin(2 * bobangle) >> 3;
 
     int nPlayerSprite = PlayerList[nLocalPlayer].nSprite;
@@ -359,7 +266,6 @@ void DrawView(int smoothRatio, bool sceneonly)
         nAngle = fix16_from_int(sprite[nSprite].ang);
 
         SetGreenPal();
-        UnMaskStatus();
 
         enemy = SnakeList[nSnakeCam].nEnemy;
 
@@ -445,7 +351,6 @@ void DrawView(int smoothRatio, bool sceneonly)
     {
         nSnakeCam = -1;
         videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
-        UnMaskStatus();
     }
 
     UpdateMap();
@@ -547,8 +452,6 @@ void DrawView(int smoothRatio, bool sceneonly)
                             fadecdaudio();
                         }
                     }
-
-                    videoSetViewableArea(nViewLeft, nViewTop, nViewRight, nViewBottom);
                 }
             }
         }
@@ -558,7 +461,6 @@ void DrawView(int smoothRatio, bool sceneonly)
             {
                 DrawWeapons(smoothRatio);
                 DrawMap();
-                DrawStatus();
             }
             else
             {
@@ -569,10 +471,6 @@ void DrawView(int smoothRatio, bool sceneonly)
 
                 DrawMap();
 
-                if (!bFullScreen) {
-                    MaskStatus();
-                }
-
                 DrawSnakeCamStatus();
             }
         }
@@ -580,7 +478,6 @@ void DrawView(int smoothRatio, bool sceneonly)
     else
     {
         twod->ClearScreen();
-        DrawStatus();
     }
 
     sprite[nPlayerSprite].cstat = nPlayerOldCstat;
@@ -597,19 +494,10 @@ bool GameInterface::GenerateSavePic()
 
 void NoClip()
 {
-    videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
-
-    bClip = false;
 }
 
 void Clip()
 {
-    videoSetViewableArea(nViewLeft, nViewTop, nViewRight, nViewBottom);
-    if (!bFullScreen) {
-        MaskStatus();
-    }
-
-    bClip = true;
 }
 
 
@@ -621,14 +509,7 @@ static SavegameHelper sgh("view",
     SV(nChunkTotal),
     SV(nCameraa),
     SV(nCamerapan),
-    SV(nViewTop),
-    SV(bClip),
-    SV(nViewBottom),
-    SV(nViewRight),
-    SV(besttarget),
-    SV(nViewLeft),
     SV(bCamera),
-    SV(nViewy),
     SV(viewz),
     SV(enemy),
     SV(nEnemyPal),
diff --git a/source/exhumed/src/view.h b/source/exhumed/src/view.h
index 8428a70cb..f7fd1a5c6 100644
--- a/source/exhumed/src/view.h
+++ b/source/exhumed/src/view.h
@@ -24,19 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 BEGIN_PS_NS
 
 extern short bSubTitles;
-extern short nViewTop;
-extern short bClip;
-extern short nViewBottom;
-extern short nViewRight;
-extern short nViewLeft;
 extern short besttarget;
 extern short bCamera;
 
 void InitView();
 void SetView1();
-void RefreshBackground();
+void DrawStatusBar();
 void DrawView(int smoothRatio, bool sceneonly = false);
-void MySetView(int x1, int y1, int x2, int y2);
 void ResetView();
 void NoClip();
 void Clip();
diff --git a/source/games/duke/src/sbar.cpp b/source/games/duke/src/sbar.cpp
index e6df52f41..ed5834fa5 100644
--- a/source/games/duke/src/sbar.cpp
+++ b/source/games/duke/src/sbar.cpp
@@ -261,11 +261,6 @@ void DrawBorder()
 		twod->AddFlatFill(x1, y2 - 4, x1 + 4, y2, ve, 2);
 		twod->AddFlatFill(x2 - 4, y2 - 4, x2, y2, ve, 4);
 	}
-	else
-	{
-		// If we got no frame just clear the screen.
-		twod->ClearScreen();
-	}
 }
 
 //==========================================================================
diff --git a/wadsrc/static/filter/exhumed/graphics/hud_l.png b/wadsrc/static/filter/exhumed/graphics/hud_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f56156949c1c8454c87c6d4a5fc3e377c89c2e8
GIT binary patch
literal 3031
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
P=TG8t(3Mc(=*Rjm;WiP2

literal 0
HcmV?d00001

diff --git a/wadsrc/static/filter/exhumed/graphics/hud_r.png b/wadsrc/static/filter/exhumed/graphics/hud_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..78b04027cec30699c16e5241dde60d415ba7a37e
GIT binary patch
literal 3132
zcmeH}`9IW&AIIlv$1#|!7P*Eb$6$=1NwfJ3AADvT42GpuJ48k)L!+EI##xe-BRd#E
zLXtB!R_U0WlUroB!@0;2BFEZ4;QJSR_x*Uh-mk~|{oDKbe!L%#cM`+SMoMD81Plg~
zqCueJuBYxwR}8tE&%M^Tvup5+jy4vsiZ12p-2&x9wWY#fk8VhAdhCJ0kT3?FX|>xY
z;}r0CJc&%E5Xg8Es7ZDOHL;+k0#jQV(8fa~96%uf6bhY0a;M<jDcUT8vL9I?oC5Qs
z;8<i5Kn59PkPZ_30K6YWU@=I+04|)a&0&%N5CkEnD;;DonUGgFhXuuguvkDjk**oV
zAjP_pQ<-=^Lo?Nj%x94VuJ{rbUce@obI3I;?MgP`35Sr(24dL^z8A>nx(m2~Aedef
z3{-{#Ey3iDU`lx`voZ>L90ff|W|Sv-wIpf}m5@7Pfzd3+Ur)fPKIXzKYj?o^;y(ia
zivT~(Rd)AIU|dH#r=9=rfH|$95AJdj=Rj^3VKC`u{|dfO`==-v4BbEjsZ3X!+N{OX
zztzdUn(McfGFC950NIT6@}#{NVvN~a8QfE8N#5^vA<jnFKTG<}^vWL{K1zj_0-4MA
zJ}yk<wO*amFZ}%I@3}M8`C38zo(q11rssdB%Dmd2#zS~~xS^IF{kXIK+r!HjA_2j+
zosNgg>T>5~cV6W0trN7jbzA$YPMoA<^5840FSGQ*iX8KM<dhb}cluMBE5ft|V-+3#
zrkz0*wOylzN83`k8TmZhmxhKBvo)FSD6Hd4t8g6d!y^r}ZT(m8kdOw~@UJV#*b_05
zo&m1Xa!oD^gilZK?UwKd9eKKgrLCLzEMwC=<9zaDvQe`yHQ(lj#VRi+*p=1d5w(#%
z)6(1T*TxcmaM42KAh(A;gja$tfj&y=2n-pM>YTH8+S#m|tBMLx&<b#TPIKp<eY7qu
zEuQ#wI@+@YohmDjA5{E>IVrgT<w81=W6dp=ASFfSW0m3RgnfTs!<l{yJDzXL(ydz*
zOlv8&({3SL|LxTe01$b=>R0!ED#u`$)b(N3+$`yIaF?bng}$SrV|GeeOD1A{>1Th#
zjP`@GNJF3y<*@Qbb52z-wDc7KwmLi8l+~`)ODZnoz)Kws$lh;JM7^q3*j6o3_+#(k
zSFfl#@Y|Ls$`5~gRinkIg)&I5-oCN&jHS-3J>G3UjWoAA!Qz~kdI}DyXWqAjt(-iW
zr&9g#w9cQzBR=EIz9XJu)CX&Dk9TS>z3WtuhFq`7>U6^o)kvrDV@~|Rk5`Rmw49$s
zCh1Ltl1g%yB?gO;g@G0ub5Q9rG#I2J!OxIrw$HQMu;rX0n&uWywsVi=T?=*3{ODyt
zRcYeKV=eV<FvHST(JwPiZAxUq?<^FCmMcGL^DP*?{$hKWQ*vi6!v|^$42bv6tEy40
z_vZze-4&#)j;p^T3l2m??!0Q<N}+59L`H^P-ubq&@_FrY{ZX6y)#qF7x^2czJrn|U
zZl)^358Mp87~EkO)JFiWUA~I&mg?>k&WwZ=6_zr+&#LPdF`X5iZbF06eL>C<C6(#{
z$eG4sBW*{uJ-h(*fmT4pc|jT~UXJrR{ng)^s-GQER=zjDWah?&=>o34IO?#9gAQ|4
zc2DtXj%OWccWLC=`DuRId*^~*<`)W`)Qb}Zd1nlqK3~g!OcR65nHCE-9S@vZba3`S
zU(`94tnt1J6b1Lv*g}xK|HU-yd=$?T^UyRR!K8BB<EfmaLC$SsiJ8K8@_n{33W(I3
z;jwx*tj}eSVBZ+ykjub(6>&_-lXk(reb(69nq{<jjy2}TMby(^<xP^_Nyc(hNJ){m
z{|b+Di;Bd(MP8-URp^GlcAmFEDyR9UzEnzROc6FXRIM8ogeLfGXl12;ZrjPbAE9c2
zIf9c##C#QAA?{U1+~0CYFm8ll$7To<;$kib++$4!hQGHbNZq2XccFv4)*cXHI*(^v
zGSc(>hCbNAV>2N`gDmHh%hB?ll)JpuR`zi%qN~eU>4Y4Q7xyqA0i!Wh$fc?bM^Kw+
zj4NL@Ds;=<`fk?hxO-?6eb?+Uemc;+Et)508t773J<0$bynE{Eec<EP=;tv6vB>Nq
z<LQ_aBN6S*MWI47!M%~^85j!<cDBg?|1j1pH?fbG6yI!P(*t0NY_EZzqA2#*jOsv*
zL%UnJ=r)QKO-x+~^EMvUUb>nlq$AZh+9n90-e|7N`laW>i`SFoIN4quTqT4?f)NW2
z*%h|;HR^2+eNL*!!qX4FJN8C|DLGsO&R^k=4U1Jd14X(&6?ra{X4Yy*s{d>_vYmPG
zF;+w`P?cy;%FasCGY?+##CogT3uWK+FSE&gs`5oRL<2wNHa0Ivm}7MF#yVF`2cUgl
zU<lFcZ)bIQ({lbwfp7uM%;`}!gCV~;UNVp&Z?#8&Mt@<;$iyCvqorOOIAdG3{wyr$
zI&=w=78>2DReX=uLwuJDR?RO{fX&ML<>F!n#^(EV%?qI0hH*h>j#B|B*(8c^(@80s
zt`A%G!ue~MUC{PGL}zpMFT!}%h~!|DwWBJr^7?Z<(Rhy=)J11&`3ik-rL*&4TP`(q
z>4^o3xvMrZHQ`1dLz}D{Z^_b9mM6Q3X2+f(yY-K_N|3!|XL@qV)1zrRVeqNRwQP0N
zK}iEj>Ye+HrnLMlIR{*us{h*Wj4x`5bM3^$tGi?tn1S75vZF&Mq$?Cq$L{u_b{;I!
z^Qr9AkUB&{h#7(y*c-`8+mClWA`rD$pqO?NIdR@@J?1wm7LbxGQ5>;@YjhL!2~uvy
zS^RZ8GN>VP8~X+ts6E$Pom_?J>=ft6-vp#ox}u`D%RJPUPIAVh5G(T((!)<Oo-V9y
zjLeqi`;zzJzM~BWhaP)QM9n`EO$S8lKGzR9L<u+(h#|;Wk%<#O2%Y?1WZHt_szed)
zX}aW$TKg=;;Mdo_D`sZ>>YL+Tigrb|&Q!&j-YJuv!^emI?*G<%YijbGN)G=@WApZx
zo@s9J_p<@3B2|MGL-}>{*x$xxSW_EM|Kz9Gt4g7_WRQdoU+W$2`9YES+wGu<#fbP%
zw5GDS4<q@umOqvjCA74>k+=Umg&2^Qh}4=cf9JQ2{vJ0IQ|}WW{qF}vv$6v#ELbuB
E0N{)!K>z>%

literal 0
HcmV?d00001