zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- added menu entries for HUD flash options. 

SVN r3614 (trunk)
This commit is contained in:
Christoph Oelckers 2012-05-01 18:20:04 +00:00
parent 75dc6cb0b2
commit 5dbf486806
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/g_shared/shared_sbar.cpp
View File

@ -88,9 +88,10 @@ int BaseBlendR, BaseBlendG, BaseBlendB;
float BaseBlendA; float BaseBlendA;
CVAR (Int, paletteflash, 0, CVAR_ARCHIVE) CVAR (Int, paletteflash, 0, CVAR_ARCHIVE)
CVAR (Flag, pf_hexenweaps, paletteflash, PF_HEXENWEAPONS) CVAR (Flag, pf_hexenweaps, paletteflash, PF_HEXENWEAPONS)
CVAR (Flag, pf_specialdamage, paletteflash, PF_SPECIALDAMAGE) CVAR (Flag, pf_poison, paletteflash, PF_POISON)
CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD) CVAR (Flag, pf_ice, paletteflash, PF_ICE)
CVAR (Flag, pf_hazard, paletteflash, PF_HAZARD)
// Stretch status bar to full screen width? // Stretch status bar to full screen width?
CUSTOM_CVAR (Bool, st_scale, true, CVAR_ARCHIVE) CUSTOM_CVAR (Bool, st_scale, true, CVAR_ARCHIVE)

4
src/v_blend.cpp
View File

@ -153,7 +153,7 @@ void V_AddPlayerBlend (player_t *CPlayer, float blend[4], float maxinvalpha, int
if (CPlayer->poisoncount) if (CPlayer->poisoncount)
{ {
cnt = MIN (CPlayer->poisoncount, 64); 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); 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 (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); V_AddBlend(0.f, 0.f, 224/255.f, 0.5f, blend);
} }

5
src/v_palette.h
View File

@ -96,8 +96,9 @@ EXTERN_CVAR (Int, paletteflash)
enum PaletteFlashFlags enum PaletteFlashFlags
{ {
PF_HEXENWEAPONS = 1, PF_HEXENWEAPONS = 1,
PF_SPECIALDAMAGE = 2, PF_POISON = 2,
PF_HAZARD = 4, PF_ICE = 4,
PF_HAZARD = 8,
}; };
class player_t; class player_t;

17
wadsrc/static/menudef.txt
View File

@ -726,6 +726,18 @@ OptionValue Crosshairs
// will be filled in from the XHAIRS lump // 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" OptionMenu "HUDOptions"
{ {
Title "HUD Options" Title "HUD Options"
@ -743,6 +755,11 @@ OptionMenu "HUDOptions"
Option "Nametag color", "nametagcolor", "TextColors", "displaynametags" Option "Nametag color", "nametagcolor", "TextColors", "displaynametags"
Option "Stretch status bar", "st_scale", "OnOff" Option "Stretch status bar", "st_scale", "OnOff"
Option "Use old ouch mug shot formula", "st_oldouch", "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"
} }
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------