lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-blendtables' into 'next' 

Fix blend tables generation

See merge request STJr/SRB2!1458
This commit is contained in:
sphere 2021-04-19 14:33:12 -04:00
parent d871612a72 0d4d2ed6d8
commit 315582bd6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/r_draw.c
View File

@ -274,7 +274,7 @@ static void BlendTab_Modulative(UINT8 *table)
static INT32 BlendTab_Count[NUMBLENDMAPS] = static INT32 BlendTab_Count[NUMBLENDMAPS] =
{ {
NUMTRANSTABLES, // blendtab_add NUMTRANSTABLES+1, // blendtab_add
NUMTRANSTABLES+1, // blendtab_subtract NUMTRANSTABLES+1, // blendtab_subtract
NUMTRANSTABLES+1, // blendtab_reversesubtract NUMTRANSTABLES+1, // blendtab_reversesubtract
1 // blendtab_modulate 1 // blendtab_modulate
@ -294,7 +294,7 @@ static INT32 BlendTab_FromStyle[] =
static void BlendTab_GenerateMaps(INT32 tab, INT32 style, void (*genfunc)(UINT8 *, int, UINT8)) static void BlendTab_GenerateMaps(INT32 tab, INT32 style, void (*genfunc)(UINT8 *, int, UINT8))
{ {
INT32 i = 0, num = BlendTab_Count[tab]; INT32 i = 0, num = BlendTab_Count[tab];
const float amtmul = (256.0f / (float)(NUMTRANSTABLES)); const float amtmul = (256.0f / (float)(NUMTRANSTABLES + 1));
for (; i < num; i++) for (; i < num; i++)
{ {
const size_t offs = (0x10000 * i); const size_t offs = (0x10000 * i);