X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Ftunnel.c;h=d10c691379f7debc88698e0737fee7e1899e5be9;hp=63f0f9feff3a3b51be8559eb77e717797328b75a;hb=0945eeeef21fe85f9a592bfc2e41069a7894b08b;hpb=9bdd6ddccd850f8a7dd2942c0b7088b77f41af0e

diff --git a/src/tunnel.c b/src/tunnel.c
index 63f0f9f..d10c691 100644
--- a/src/tunnel.c
+++ b/src/tunnel.c
@@ -6,6 +6,7 @@
 #include "imago2.h"
 #include "demo.h"
 #include "screen.h"
+#include "gfxutil.h"
 
 #ifndef M_PI
 #define M_PI	3.1415926535
@@ -213,11 +214,6 @@ static void tunnel_color(int *rp, int *gp, int *bp, long toffs, unsigned int tpa
 	*bp = (b * fog) >> 8;
 }
 
-#define PACK_RGB16(r, g, b) \
-	(((((r) >> 3) & 0x1f) << 11) | ((((g) >> 2) & 0x3f) << 5) | (((b) >> 3) & 0x1f))
-#define PACK_RGB32(r, g, b) \
-	((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
-
 static void draw_tunnel_range(unsigned short *pix, int xoffs, int yoffs, int starty, int num_lines, long tm)
 {
 	int i, j;