diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp index 3ad024c7c3..ee4e98890a 100644 --- a/src/g_shared/shared_sbar.cpp +++ b/src/g_shared/shared_sbar.cpp @@ -88,9 +88,10 @@ int BaseBlendR, BaseBlendG, BaseBlendB; float BaseBlendA; CVAR (Int, paletteflash, 0, CVAR_ARCHIVE) -CVAR (Flag, pf_hexenweaps, paletteflash, PF_HEXENWEAPONS) -CVAR (Flag, pf_specialdamage, paletteflash, PF_SPECIALDAMAGE) -CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD) +CVAR (Flag, pf_hexenweaps, paletteflash, PF_HEXENWEAPONS) +CVAR (Flag, pf_poison, paletteflash, PF_POISON) +CVAR (Flag, pf_ice, paletteflash, PF_ICE) +CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD) // Stretch status bar to full screen width? CUSTOM_CVAR (Bool, st_scale, true, CVAR_ARCHIVE) diff --git a/src/v_blend.cpp b/src/v_blend.cpp index 61322ab079..1ec7837a0f 100644 --- a/src/v_blend.cpp +++ b/src/v_blend.cpp @@ -153,7 +153,7 @@ void V_AddPlayerBlend (player_t *CPlayer, float blend[4], float maxinvalpha, int if (CPlayer->poisoncount) { cnt = MIN (CPlayer->poisoncount, 64); - if (paletteflash & PF_SPECIALDAMAGE) + if (paletteflash & PF_POISON) { V_AddBlend(44/255.f, 92/255.f, 36/255.f, ((cnt + 7) >> 3) * 0.1f, blend); } @@ -182,7 +182,7 @@ void V_AddPlayerBlend (player_t *CPlayer, float blend[4], float maxinvalpha, int if (CPlayer->mo->DamageType == NAME_Ice) { - if (paletteflash & PF_SPECIALDAMAGE) + if (paletteflash & PF_ICE) { V_AddBlend(0.f, 0.f, 224/255.f, 0.5f, blend); } diff --git a/src/v_palette.h b/src/v_palette.h index fa6309c83f..ce2152fb15 100644 --- a/src/v_palette.h +++ b/src/v_palette.h @@ -96,8 +96,9 @@ EXTERN_CVAR (Int, paletteflash) enum PaletteFlashFlags { PF_HEXENWEAPONS = 1, - PF_SPECIALDAMAGE = 2, - PF_HAZARD = 4, + PF_POISON = 2, + PF_ICE = 4, + PF_HAZARD = 8, }; class player_t; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index ffeaf4cd0e..2eab5628be 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -726,6 +726,18 @@ OptionValue Crosshairs // will be filled in from the XHAIRS lump } +OptionValue ZDoomHexen +{ + 0.0, "ZDoom" + 1.0, "Hexen" +} + +OptionValue ZDoomStrife +{ + 0.0, "ZDoom" + 1.0, "Strife" +} + OptionMenu "HUDOptions" { Title "HUD Options" @@ -743,6 +755,11 @@ OptionMenu "HUDOptions" Option "Nametag color", "nametagcolor", "TextColors", "displaynametags" Option "Stretch status bar", "st_scale", "OnOff" Option "Use old ouch mug shot formula", "st_oldouch", "OnOff" + StaticText " " + Option "Hexen weapon flashes", "pf_hexenweaps", "ZDoomHexen" + Option "Poison damage flashes", "pf_poison", "ZDoomHexen" + Option "Ice death flashes", "pf_ice", "ZDoomHexen" + Option "Poison Buildup flashes", "pf_hazard", "ZDoomStrife" } //-------------------------------------------------------------------------------------------