From 1abcd667c8280f17c827e15f91d3a71a4e16961e Mon Sep 17 00:00:00 2001
From: noa
Date: Fri, 29 Dec 2023 16:37:57 +0000
Subject: Remove ifdefs for monochromacy

---
 Makefile |  2 +-
 ui.c     | 30 ------------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index e06736a..d8b8730 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ catgirl: ${OBJS}
 	${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
 
 catgirl-no-color: ${OBJS}
-	${CC} -DNOA_NO_COLOR=1 ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
+	${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
 
 ${OBJS}: chat.h
 
diff --git a/ui.c b/ui.c
index 04a5631..0f4c982 100644
--- a/ui.c
+++ b/ui.c
@@ -164,8 +164,6 @@ void uiDraw(void) {
 }
 
 
-#define NOA_NO_COLOR
-#ifdef NOA_NO_COLOR
 static const short Colors[ColorCap] = {
 	[Default]    = -1,
 	[White]      = -1,
@@ -192,34 +190,6 @@ static const short Colors[ColorCap] = {
 	217, 223, 229, 193, 157, 158, 159, 153, 147, 183, 219, 212,
 	16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231,
 };
-#else
-static const short Colors[ColorCap] = {
-	[Default]    = -1,
-	[White]      = 8 + COLOR_WHITE,
-	[Black]      = 0 + COLOR_BLACK,
-	[Blue]       = 0 + COLOR_BLUE,
-	[Green]      = 0 + COLOR_GREEN,
-	[Red]        = 8 + COLOR_RED,
-	[Brown]      = 0 + COLOR_RED,
-	[Magenta]    = 0 + COLOR_MAGENTA,
-	[Orange]     = 0 + COLOR_YELLOW,
-	[Yellow]     = 8 + COLOR_YELLOW,
-	[LightGreen] = 8 + COLOR_GREEN,
-	[Cyan]       = 0 + COLOR_CYAN,
-	[LightCyan]  = 8 + COLOR_CYAN,
-	[LightBlue]  = 8 + COLOR_BLUE,
-	[Pink]       = 8 + COLOR_MAGENTA,
-	[Gray]       = 8 + COLOR_BLACK,
-	[LightGray]  = 0 + COLOR_WHITE,
-	52, 94, 100, 58, 22, 29, 23, 24, 17, 54, 53, 89,
-	88, 130, 142, 64, 28, 35, 30, 25, 18, 91, 90, 125,
-	124, 166, 184, 106, 34, 49, 37, 33, 19, 129, 127, 161,
-	196, 208, 226, 154, 46, 86, 51, 75, 21, 171, 201, 198,
-	203, 215, 227, 191, 83, 122, 87, 111, 63, 177, 207, 205,
-	217, 223, 229, 193, 157, 158, 159, 153, 147, 183, 219, 212,
-	16, 233, 235, 237, 239, 241, 244, 247, 250, 254, 231,
-};
-#endif
 
 uint uiAttr(struct Style style) {
 	attr_t attr = A_NORMAL;
-- 
cgit 1.4.1-2-gfad0