X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2F3dgfx.c;h=6737094e3f0083ab34c5e9ed612b9df24bc8f324;hp=fb24c430a462d4456f04cec7ed713d85ce6720ac;hb=57348c2e13f4de9e49f8428b9fec3f47f863a257;hpb=282021dce00ae9430184cb033c1e49ba5aa132a1

diff --git a/src/3dgfx.c b/src/3dgfx.c
index fb24c43..6737094 100644
--- a/src/3dgfx.c
+++ b/src/3dgfx.c
@@ -586,21 +586,22 @@ void g3d_normal(float x, float y, float z)
 }
 
 #define CLAMP(x, a, b)	((x) < (a) ? (a) : ((x) > (b) ? (b) : (x)))
+#define MIN(a, b)		((a) < (b) ? (a) : (b))
 
 void g3d_color3b(unsigned char r, unsigned char g, unsigned char b)
 {
-	st->imm_curv.r = CLAMP(r, 0, 255);
-	st->imm_curv.g = CLAMP(g, 0, 255);
-	st->imm_curv.b = CLAMP(b, 0, 255);
+	st->imm_curv.r = MIN(r, 255);
+	st->imm_curv.g = MIN(g, 255);
+	st->imm_curv.b = MIN(b, 255);
 	st->imm_curv.a = 255;
 }
 
 void g3d_color4b(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 {
-	st->imm_curv.r = CLAMP(r, 0, 255);
-	st->imm_curv.g = CLAMP(g, 0, 255);
-	st->imm_curv.b = CLAMP(b, 0, 255);
-	st->imm_curv.a = CLAMP(a, 0, 255);
+	st->imm_curv.r = MIN(r, 255);
+	st->imm_curv.g = MIN(g, 255);
+	st->imm_curv.b = MIN(b, 255);
+	st->imm_curv.a = MIN(a, 255);
 }
 
 void g3d_color3f(float r, float g, float b)