From 652c0044a18152103acbae0ab48478dceaac96d1 Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 14 Jun 2018 17:49:53 +0000 Subject: [PATCH] Fix building the Build tools git-svn-id: https://svn.eduke32.com/eduke32@6924 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 1 + source/tools/src/transpal.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 042823606..c39c6d314 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -218,6 +218,7 @@ engine_tools_objs := \ cache1d.cpp \ crc32.cpp \ colmatch.cpp \ + lz4.cpp \ ifeq (0,$(NOASM)) engine_objs += a.nasm diff --git a/source/tools/src/transpal.cpp b/source/tools/src/transpal.cpp index a0aef716d..21821e452 100644 --- a/source/tools/src/transpal.cpp +++ b/source/tools/src/transpal.cpp @@ -26,7 +26,7 @@ static char getshade(char dashade, char dacol) r = ((ptr[0]*t+32768)>>16); g = ((ptr[1]*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) @@ -39,7 +39,7 @@ static char gettrans(char dat1, char dat2, int datransratio) r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8); g = ptr[1]; g += (((ptr2[1]-g)*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)