From e28dbf517e4305d08c6a8b23f3b8f547602b4a2e Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Mon, 5 Nov 2018 15:35:08 +0100
Subject: [PATCH] minor cleanup

from the 4th of september, never committed
---
 schemes.h | 7 ++-----
 viiper.c  | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/schemes.h b/schemes.h
index e80cb37..f3ba53c 100644
--- a/schemes.h
+++ b/schemes.h
@@ -9,9 +9,6 @@
 #define BORDER_S 3
 #define BORDER_L 0
 #define BORDER_R 2
-//#define BORDER(v,h) op.sch->border[BORDER_ ## v][BORDER_ ## h]
-#define BORDER(v,h) (g.b.t&1<<BONUS_WRAP?op.sch->permeable:op.sch->border) \
-	[BORDER_ ## v][BORDER_ ## h]
 
 struct scheme {
 	char* border[4][3];
@@ -34,7 +31,7 @@ struct scheme unic0de = {
 		{"╚", "══", "╝"},
 		{  "╡","","╞"  },
 	},
-	.permeable = {//┅╍
+	.permeable = {
 		{"┏", "╍╍", "┓"},
 		{"┋", "  ", "┋"},
 		{"┗", "╍╍", "┛"},
@@ -92,7 +89,7 @@ struct scheme unic0de = {
 		[BONUS_SLOW] = "🐌",
 		[BONUS_FAST] = "🐇",
 		[BONUS_WRAP] = "🧱",
-		[BONUS_STOP] = "⏳", //alt: 🛑
+		[BONUS_STOP] = "⏳",
 	},
 
 	.cell_width = 2,
diff --git a/viiper.c b/viiper.c
index f90fa17..f431ca7 100644
--- a/viiper.c
+++ b/viiper.c
@@ -37,6 +37,8 @@
 #define print(str) fputs (str?str:"", stdout)
 #define CTRL_ 0x1F &
 
+#define BORDER(v,h) (g.b.t&1<<BONUS_WRAP?op.sch->permeable:op.sch->border) \
+	[BORDER_ ## v][BORDER_ ## h]
 #define OPPOSITE(dir) ( \
 	dir == EAST  ? WEST  :   \
 	dir == WEST  ? EAST  :   \
@@ -95,7 +97,7 @@ int main (int argc, char** argv) {
 
 	int optget;
 	opterr = 0; /* don't print message on unrecognized option */
-	while ((optget = getopt (argc, argv, "+s:l:dh")) != -1) {
+	while ((optget = getopt (argc, argv, "+s:l:h")) != -1) {
 		switch (optget) {
 		case 's':
 			op.s = atof(optarg);
@@ -470,7 +472,6 @@ void pause_game (void) {
 
 #define MOVE_POPUP(WIDTH, LINE) \
 	move_ph(g.h/2+LINE_OFFSET-1+LINE,(g.w*DW-WIDTH)/2)
-	//TODO: macro does not correctly centre in DEC mode
 int end_screen(char* message) {
 	int msg_w = strlen(message);
 	MOVE_POPUP(msg_w, -1);
@@ -481,7 +482,6 @@ int end_screen(char* message) {
 	MOVE_POPUP(msg_w, 0);
 	printf("%s %s %s", BORDER(C,L), message, BORDER(C,R));
 	MOVE_POPUP(msg_w, 1);
-	//TODO: requires shifting into ASCII/multilingual charset in DEC mode -- put graphics into upper/right charset?
 	printf("%s `r' restart%*s%s", BORDER(C,L), msg_w-10, "", BORDER(C,R));
 	MOVE_POPUP(msg_w, 2);
 	printf("%s `q' quit%*s%s", BORDER(C,L), msg_w-7, "", BORDER(C,R));
-- 
2.39.3