archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-01 22:25:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lumps/sbarinfo: Fix the file formatting to Unix newlines

Browse source 
The .gitattributes file tries to enforce Unix newlines, for
Windows users, but somehow this still got forced through...

It messed up the display of `git status`
This commit is contained in:
Mike Swanson 2016-12-14 01:18:23 -08:00
parent 347e2d408f
commit 0a116b487e
1 changed files with 118 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

236
lumps/sbarinfo.lmp
View file

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