stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ogl-color-fix-fix' into 'master'

Browse source 
Fix bug in the OpenGL colormap bugfix

See merge request KartKrew/Kart-Public!183
This commit is contained in:
Sal 2020-06-13 22:45:47 -04:00
commit eea8c3776c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.c
View file

@ -1494,6 +1494,7 @@ static void P_LoadRawSideDefs2(void *data)
color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]); color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]); color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]); color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
color.s.alpha = 0;
#ifdef GLENCORE #ifdef GLENCORE
if (encoremap) if (encoremap)
@ -1535,6 +1536,7 @@ static void P_LoadRawSideDefs2(void *data)
color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]); color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]); color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]); color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
color.s.alpha = 0;
#ifdef GLENCORE #ifdef GLENCORE
if (encoremap) if (encoremap)