From 813c8c54ff7d611e71b1cd04b12a9c99fedce725 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Wed, 29 Apr 2020 15:07:25 +0000
Subject: [PATCH] Some compile fixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5687 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 build_wip.sh               | 4 ++--
 engine/client/image_astc.h | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build_wip.sh b/build_wip.sh
index e9954995..c9ca6d43 100755
--- a/build_wip.sh
+++ b/build_wip.sh
@@ -324,7 +324,7 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
 		cd $SVNROOT/quakec
 		cd csaddon/src
 		$BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt
-		mv ../csaddon.dat $BUILDFOLDER/csaddon/
+		cp ../csaddon.dat $BUILDFOLDER/csaddon/
 		cd ..
 		zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
 
@@ -333,7 +333,7 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
 		$BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt
 		rm -f fteqcc.log
 		zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip .
-		mv ../menu.dat $BUILDFOLDER/csaddon/
+		cp ../menu.dat $BUILDFOLDER/csaddon/
 		cd ..
 		zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
 	else
diff --git a/engine/client/image_astc.h b/engine/client/image_astc.h
index a28f8045..4b78a1fa 100644
--- a/engine/client/image_astc.h
+++ b/engine/client/image_astc.h
@@ -1501,6 +1501,8 @@ ASTC_PUBLIC void ASTC_Decode_LDR8(unsigned char *in, unsigned char *out, int pix
 				}
 			}
 		}
+		#undef N
+		#undef M
 	}
 	else
 	{	//error colour == magenta
@@ -1647,12 +1649,12 @@ ASTC_PUBLIC void ASTC_Decode_HDR(unsigned char *in, unsigned short *out, int pix
 		{
 #ifdef ASTC_WITH_3D
 			r = ((dr*z)*(b.wcount[2]-1)+32)>>6;
-			fr=s&0xf;
+			fr=r&0xf;
 #endif
 			for (y = 0; y < bh; y++, out += stride)
 			{
 				t = ((dt*y)*(b.wcount[1]-1)+32)>>6;
-				ft=s&0xf;
+				ft=t&0xf;
 				for (x = 0; x < bw; x++)
 				{
 					p = &b.part[ASTC_ChoosePartition(b.partindex, x,y,0, b.partitions, smallblock)];
@@ -1726,6 +1728,8 @@ ASTC_PUBLIC void ASTC_Decode_HDR(unsigned char *in, unsigned short *out, int pix
 				}
 			}
 		}
+		#undef N
+		#undef M
 	}
 	else
 	{	//error colour == magenta