mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-12 23:54:35 +00:00
- Fixed: The yellow color range contained gaps in its definition which
resulted in incorrect colors. - Fixed: FFont::BuildTranslations didn't clamp the RGB color values. This can happen if some font colors overflow or underflow due to incomplete range specifications. SVN r358 (trunk)
This commit is contained in:
parent
dd5f01b91e
commit
fb5f4a132b
3 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
October 21, 2006 (Changes by Graf Zahl)
|
||||||
|
- Fixed: The yellow color range contained gaps in its definition which
|
||||||
|
resulted in incorrect colors.
|
||||||
|
- Fixed: FFont::BuildTranslations didn't clamp the RGB color values. This
|
||||||
|
can happen if some font colors overflow or underflow due to incomplete
|
||||||
|
range specifications.
|
||||||
|
|
||||||
October 20, 2006
|
October 20, 2006
|
||||||
- Fixed: ExpData::EvalConst() did not NULL the children pointers for binary
|
- Fixed: ExpData::EvalConst() did not NULL the children pointers for binary
|
||||||
operators after deleting them, so ~ExpData() would try to delete them again
|
operators after deleting them, so ~ExpData() would try to delete them again
|
||||||
|
|
|
@ -578,6 +578,9 @@ void FFont::BuildTranslations (const double *luminosity, const BYTE *identity, c
|
||||||
int r = ((parms->Start[0] << 8) + rangev * (parms->End[0] - parms->Start[0])) >> 8; // red
|
int r = ((parms->Start[0] << 8) + rangev * (parms->End[0] - parms->Start[0])) >> 8; // red
|
||||||
int g = ((parms->Start[1] << 8) + rangev * (parms->End[1] - parms->Start[1])) >> 8; // green
|
int g = ((parms->Start[1] << 8) + rangev * (parms->End[1] - parms->Start[1])) >> 8; // green
|
||||||
int b = ((parms->Start[2] << 8) + rangev * (parms->End[2] - parms->Start[2])) >> 8; // blue
|
int b = ((parms->Start[2] << 8) + rangev * (parms->End[2] - parms->Start[2])) >> 8; // blue
|
||||||
|
r=clamp(r, 0, 255);
|
||||||
|
g=clamp(g, 0, 255);
|
||||||
|
b=clamp(b, 0, 255);
|
||||||
*range++ = ColorMatcher.Pick (r, g, b);
|
*range++ = ColorMatcher.Pick (r, g, b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ Console:
|
||||||
Yellow
|
Yellow
|
||||||
{
|
{
|
||||||
#272727 #515151 0 64
|
#272727 #515151 0 64
|
||||||
#865318 #EB9F18 80 192
|
#784918 #F3A718 65 207
|
||||||
#F3A82A #FCD043 208 256
|
#F3A82A #FCD043 208 256
|
||||||
Console:
|
Console:
|
||||||
#000000 #7F7F00 0 127
|
#000000 #7F7F00 0 127
|
||||||
|
|
Loading…
Reference in a new issue