- fixed: meleethreshold only has meaning when the attacking monster actually
has a melee attack. - copied a colormap fix from Skulltag. SVN r531 (trunk)
This commit is contained in:
parent
a6a5821f04
commit
ea2ea7dbf0
4 changed files with 17 additions and 7 deletions
|
|
@ -759,8 +759,13 @@ void FDynamicColormap::ChangeColor (PalEntry lightcolor, int desaturate)
|
|||
if (lightcolor != Color || desaturate != Desaturate)
|
||||
{
|
||||
Color = lightcolor;
|
||||
// [BB] desaturate must be in [0,255]
|
||||
if( desaturate > 255 )
|
||||
desaturate = 255;
|
||||
else if ( desaturate < 0 )
|
||||
desaturate = 0;
|
||||
Desaturate = desaturate;
|
||||
BuildLights ();
|
||||
if (Maps) BuildLights ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -769,7 +774,7 @@ void FDynamicColormap::ChangeFade (PalEntry fadecolor)
|
|||
if (fadecolor != Fade)
|
||||
{
|
||||
Fade = fadecolor;
|
||||
BuildLights ();
|
||||
if (Maps) BuildLights ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -779,7 +784,7 @@ void FDynamicColormap::ChangeColorFade (PalEntry lightcolor, PalEntry fadecolor)
|
|||
{
|
||||
Color = lightcolor;
|
||||
Fade = fadecolor;
|
||||
BuildLights ();
|
||||
if (Maps) BuildLights ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue