zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix building the Build tools

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6924 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-06-14 17:49:53 +00:00
parent f873b551a8
commit 652c0044a1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GNUmakefile
View file

@ -218,6 +218,7 @@ engine_tools_objs := \
cache1d.cpp \ cache1d.cpp \
crc32.cpp \ crc32.cpp \
colmatch.cpp \ colmatch.cpp \
lz4.cpp \
ifeq (0,$(NOASM)) ifeq (0,$(NOASM))
engine_objs += a.nasm engine_objs += a.nasm

4
source/tools/src/transpal.cpp
View file

@ -26,7 +26,7 @@ static char getshade(char dashade, char dacol)
r = ((ptr[0]*t+32768)>>16); r = ((ptr[0]*t+32768)>>16);
g = ((ptr[1]*t+32768)>>16); g = ((ptr[1]*t+32768)>>16);
b = ((ptr[2]*t+32768)>>16); b = ((ptr[2]*t+32768)>>16);
return(getclosestcol(r,g,b)); return(paletteGetClosestColor(r,g,b));
} }
static char gettrans(char dat1, char dat2, int datransratio) static char gettrans(char dat1, char dat2, int datransratio)
@ -39,7 +39,7 @@ static char gettrans(char dat1, char dat2, int datransratio)
r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8); r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8);
g = ptr[1]; g += (((ptr2[1]-g)*datransratio+128)>>8); g = ptr[1]; g += (((ptr2[1]-g)*datransratio+128)>>8);
b = ptr[2]; b += (((ptr2[2]-b)*datransratio+128)>>8); b = ptr[2]; b += (((ptr2[2]-b)*datransratio+128)>>8);
return(getclosestcol(r,g,b)); return(paletteGetClosestColor(r,g,b));
} }
int main(int argc, char **argv) int main(int argc, char **argv)