diff --git a/buildcfg.txt b/buildcfg.txt index 90d05fbf..5d505bee 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -177,6 +177,9 @@ 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 @@ -638,6 +641,8 @@ 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 new file mode 100644 index 00000000..4b6e6909 Binary files /dev/null and b/graphics/stbarl.gif differ diff --git a/graphics/stbarr.gif b/graphics/stbarr.gif new file mode 100644 index 00000000..b1d94393 Binary files /dev/null and b/graphics/stbarr.gif differ diff --git a/lumps/sbarinfo.lmp b/lumps/sbarinfo.lmp new file mode 100644 index 00000000..79ff6bf9 --- /dev/null +++ b/lumps/sbarinfo.lmp @@ -0,0 +1,118 @@ +//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; +}