mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-29 07:02:08 +00:00
v_contentblend works in both QW and uquake now; also, it is a float (not toggle) now.
This commit is contained in:
parent
20c4669f0f
commit
7da71c8673
1 changed files with 4 additions and 2 deletions
|
@ -438,12 +438,11 @@ V_BonusFlash_f ( void )
|
||||||
void
|
void
|
||||||
V_SetContentsColor (int contents)
|
V_SetContentsColor (int contents)
|
||||||
{
|
{
|
||||||
#ifdef QUAKEWORLD
|
|
||||||
if (!v_contentblend->value) {
|
if (!v_contentblend->value) {
|
||||||
cl.cshifts[CSHIFT_CONTENTS] = cshift_empty;
|
cl.cshifts[CSHIFT_CONTENTS] = cshift_empty;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
switch (contents)
|
switch (contents)
|
||||||
{
|
{
|
||||||
case CONTENTS_SOLID:
|
case CONTENTS_SOLID:
|
||||||
|
@ -464,6 +463,9 @@ V_SetContentsColor (int contents)
|
||||||
default:
|
default:
|
||||||
cl.cshifts[CSHIFT_CONTENTS] = cshift_water;
|
cl.cshifts[CSHIFT_CONTENTS] = cshift_water;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (v_contentblend->value > 0 && v_contentblend->value < 1)
|
||||||
|
cl.cshifts[CSHIFT_CONTENTS].percent *= v_contentblend->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue