diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f7f132e..4ebdeeae9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ - **NUGHUD:** - Let Ammo and Armor icons fall back to vanilla sprites; - - Made Patches and Ammo and Armor icons alignable horizontally and vertically. + - Made Patches and Ammo and Armor icons alignable horizontally and vertically; + - Disabled Armor icon by default. - **MDK Fist attacks now prioritize enemies over friends** ## Bug Fixes diff --git a/docs/nughud.lmp b/docs/nughud.lmp index 39654fbc5..45c1ff45f 100644 --- a/docs/nughud.lmp +++ b/docs/nughud.lmp @@ -9,7 +9,7 @@ nughud_ammo_wide -1 nughud_ammo_align 1 ; Ammo icon -nughud_ammoicon_x 0 +nughud_ammoicon_x -1 nughud_ammoicon_y 0 nughud_ammoicon_wide 0 nughud_ammoicon_align -1 @@ -79,7 +79,7 @@ nughud_armor_wide 1 nughud_armor_align 1 ; Armor icon -nughud_armoricon_x 0 +nughud_armoricon_x -1 nughud_armoricon_y 0 nughud_armoricon_wide 0 nughud_armoricon_align -1 diff --git a/src/m_nughud.c b/src/m_nughud.c index 485e89d49..075d46b71 100644 --- a/src/m_nughud.c +++ b/src/m_nughud.c @@ -67,7 +67,7 @@ nughud_t nughud; // Behold!!! default_t nughud_defaults[] = { WIDGET2( "nughud_ammo", nughud.ammo, ST_AMMOX, ST_AMMOY, -1, 1 ), - WIDGET3( "nughud_ammoicon", nughud.ammoicon, 0, 0, 0, -1, 1 ), + WIDGET3( "nughud_ammoicon", nughud.ammoicon, -1, 0, 0, -1, 1 ), TOGGLE( "nughud_ammoicon_big",nughud.ammoicon_big, 0 ), WIDGET2( "nughud_health", nughud.health, ST_HEALTHX, ST_HEALTHY, -1, 1 ), WIDGET( "nughud_arms1", nughud.arms[0], -1, 0, 0 ), @@ -83,7 +83,7 @@ default_t nughud_defaults[] = { WIDGET( "nughud_face", nughud.face, -1, ST_FACESY, 0 ), TOGGLE( "nughud_face_bg", nughud.face_bg, 1 ), WIDGET2( "nughud_armor", nughud.armor, ST_ARMORX, ST_ARMORY, 1, 1 ), - WIDGET3( "nughud_armoricon", nughud.armoricon, 0, 0, 0, -1, 1 ), + WIDGET3( "nughud_armoricon", nughud.armoricon, -1, 0, 0, -1, 1 ), WIDGET( "nughud_key0", nughud.keys[0], ST_KEY0X, ST_KEY0Y, 1 ), WIDGET( "nughud_key1", nughud.keys[1], ST_KEY1X, ST_KEY1Y, 1 ), WIDGET( "nughud_key2", nughud.keys[2], ST_KEY2X, ST_KEY2Y, 1 ),