From 1adfc2d576f2b60d6ec9a5ea98319fc1a039d8b5 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Fri, 17 Feb 2017 14:54:19 -0800
Subject: [PATCH] RIP widescreen status bar support.

Causes conflicts with ZDoom mods that try to define their own HUDs,
at least three on IRC were reported as being basically totally broken
with Freedoom 0.11.  While it was a good attempt at adding an
enhancement to Freedoom under ZDoom, we cannot afford to break mod
compatibility.
---
 buildcfg.txt        |   5 --
 graphics/stbarl.gif | Bin 2292 -> 0 bytes
 graphics/stbarr.gif | Bin 2303 -> 0 bytes
 lumps/sbarinfo.lmp  | 118 --------------------------------------------
 4 files changed, 123 deletions(-)
 delete mode 100644 graphics/stbarl.gif
 delete mode 100644 graphics/stbarr.gif
 delete mode 100644 lumps/sbarinfo.lmp

diff --git a/buildcfg.txt b/buildcfg.txt
index 59379c86..7200f334 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -151,9 +151,6 @@ FREEDOOM
 ; Big font used by ZDoom-based ports for menu text.
 DBIGFONT
 
-; Widescreen statusbar for ZDoom-based ports
-SBARINFO
-
 #ifdef FREEDM
 DEHACKED = fdm_deh
 ZMAPINFO = fdmmpinf
@@ -615,8 +612,6 @@ AMMNUM7	-1	0
 AMMNUM8	-1	0
 AMMNUM9	-1	0
 STBAR	0	0
-STBARR 0 0
-STBARL 0 0
 STGNUM0	0	0
 STGNUM1	0	0
 STGNUM2	0	0
diff --git a/graphics/stbarl.gif b/graphics/stbarl.gif
deleted file mode 100644
index 55a21534bc6e8f08ffcac37ee552747999c6e026..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2292
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
OcKvN%kGt6+0028|aIl2{

diff --git a/graphics/stbarr.gif b/graphics/stbarr.gif
deleted file mode 100644
index d0c9d6f1eeaf149ff19121fafef2505318f37608..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2303
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
ZD=`3JU*Ox)jyAHty=-qsJK7-t06W94tF-_C

diff --git a/lumps/sbarinfo.lmp b/lumps/sbarinfo.lmp
deleted file mode 100644
index a51e35e0..00000000
--- a/lumps/sbarinfo.lmp
+++ /dev/null
@@ -1,118 +0,0 @@
-//This file is used to add widescreen
-//support to Freedoom's status bar.
-height 32;
-monospacefonts true, "0";
-
-statusbar fullscreen, fullscreenoffsets // ZDoom HUD
-{
-    //health
-    drawimage "MEDIA0", 20, -2, centerbottom;
-    drawnumber 3, HUDFONT_DOOM, untranslated, health, drawshadow, 82, -20;
-
-    //armor
-    drawimage armoricon, 20, -24, centerbottom;
-    drawnumber 3, HUDFONT_DOOM, untranslated, armor, drawshadow, whennotzero, 82, -39;
-
-    //ammo
-    drawimage ammoicon1, -14, -4, centerbottom;
-    drawnumber 3, HUDFONT_DOOM, untranslated, ammo1, drawshadow, -25, -20;
-
-    usesammo
-    {
-        //secondary ammo and inventory
-        usessecondaryammo
-        {
-            drawimage ammoicon2, -14, -22, centerbottom;
-            drawnumber 3, HUDFONT_DOOM, untranslated, ammo2, drawshadow, -25, -38;
-            inventorybarnotvisible
-            {
-                drawselectedinventory centerbottom, drawshadow, alwaysshowcounter, HUDFONT_DOOM, -14, -39, -26, -56, untranslated;
-            }
-        }
-        //no secondary ammo
-        usessecondaryammo not
-        {
-            inventorybarnotvisible
-            {
-                drawselectedinventory centerbottom, drawshadow, alwaysshowcounter, HUDFONT_DOOM, -14, -21, -26, -38, untranslated;
-            }
-        }
-    }
-
-    // no ammo but inventory
-    usesammo not
-    {
-        inventorybarnotvisible
-        {
-            drawselectedinventory centerbottom, drawshadow, alwaysshowcounter, HUDFONT_DOOM, -14, -3, -26, -20, untranslated;
-        }
-    }
-
-    gamemode deathmatch
-    {
-        drawnumber 2, HUDFONT_DOOM, untranslated, frags, drawshadow, -3, 1;
-    }
-    gamemode singleplayer, cooperative, teamgame
-    {
-        drawkeybar 6, vertical, reverserows, auto, -10, 2, 0, 3, auto;
-    }
-}
-
-statusbar normal // Freedoom status bar with widescreen enhancements
-{
-    drawimage "STBAR", 0, 168;
-    drawimage "STBARL", -120, 168;
-    drawimage "STBARR", 320, 168;
-    drawimage "STTPRCNT", 90, 171;
-    drawimage "STTPRCNT", 221, 171;
-    drawnumber 3, HUDFONT_DOOM, untranslated, ammo1, 44, 171;
-    drawnumber 3, HUDFONT_DOOM, untranslated, health, 90, 171;
-    drawnumber 3, HUDFONT_DOOM, untranslated, armor, 221, 171;
-
-    //keys
-    drawswitchableimage keyslot 2 && 5, "nullimage", "STKEYS0", "STKEYS3", "STKEYS6", 239, 171;
-    drawswitchableimage keyslot 3 && 6, "nullimage", "STKEYS1", "STKEYS4", "STKEYS7", 239, 181;
-    drawswitchableimage keyslot 1 && 4, "nullimage", "STKEYS2", "STKEYS5", "STKEYS8", 239, 191;
-
-    drawnumber 3, INDEXFONT, gold, ammo Clip, 288, 173;
-    drawnumber 3, INDEXFONT, gold, ammo Shell, 288, 179;
-    drawnumber 3, INDEXFONT, gold, ammo RocketAmmo, 288, 185;
-    drawnumber 3, INDEXFONT, gold, ammo Cell, 288, 191;
-
-    drawnumber 3, INDEXFONT, gold, ammocapacity Clip, 314, 173;
-    drawnumber 3, INDEXFONT, gold, ammocapacity Shell, 314, 179;
-    drawnumber 3, INDEXFONT, gold, ammocapacity RocketAmmo, 314, 185;
-    drawnumber 3, INDEXFONT, gold, ammocapacity Cell, 314, 191;
-    gamemode deathmatch, teamgame
-    {
-        drawnumber 2, HUDFONT_DOOM, untranslated, frags, 138, 171;
-    }
-    gamemode cooperative, singleplayer
-    {
-        drawimage "STARMS", 104, 168;
-        drawswitchableimage weaponslot 2, "STGNUM2", "STYSNUM2", 111, 172;
-        drawswitchableimage weaponslot 3, "STGNUM3", "STYSNUM3", 123, 172;
-        drawswitchableimage weaponslot 4, "STGNUM4", "STYSNUM4", 135, 172;
-        drawswitchableimage weaponslot 5, "STGNUM5", "STYSNUM5", 111, 182;
-        drawswitchableimage weaponslot 6, "STGNUM6", "STYSNUM6", 123, 182;
-        drawswitchableimage weaponslot 7, "STGNUM7", "STYSNUM7", 135, 182;
-    }
-    gamemode cooperative, deathmatch, teamgame
-    {
-        drawimage translatable "STFBANY", 144, 169;
-    }
-    drawselectedinventory alternateonempty, INDEXFONT, 143, 168
-    {
-        drawmugshot 5, 143, 168;
-    }
-}
-
-statusbar inventory // Standard bar overlay (ZDoom Addition)
-{
-    drawinventorybar Doom, 7, INDEXFONT, 50, 170;
-}
-
-statusbar inventoryfullscreen // ZDoom HUD overlay.
-{
-    drawinventorybar Doom, translucent, 7, INDEXFONT, 50, 170;
-}