From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 28 Aug 2008 01:30:56 +0000 (-0400)
Subject: Simplify routech[]
X-Git-Tag: v4.3.17~86
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=d012940230f69dcfbd0346b887fee0bb6f291461

Simplify routech[]

routech[][1] hasn't been used in living memory.  Drop it, and simplify
to routech[].
---

diff --git a/include/path.h b/include/path.h
index e3bf92a9c..04c2d8f1b 100644
--- a/include/path.h
+++ b/include/path.h
@@ -58,7 +58,7 @@ enum p_mode {			/* How to find path to destination */
 extern signed char dirindex['z'-'a'+1];
 extern int diroff[DIR_MAP+1][2];
 extern char dirch[DIR_MAP+2];
-extern char *routech[DIR_LAST+1][2];
+extern char *routech[DIR_LAST+1];
 
 /* src/lib/subs/paths.c */
 extern char *getpath(char *, char *, coord, coord, int, int, enum p_mode);
diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c
index f143a3642..fa9d6cbad 100644
--- a/src/lib/commands/path.c
+++ b/src/lib/commands/path.c
@@ -101,8 +101,7 @@ path(void)
 	if (i == DIR_STOP)
 	    break;
 	memcpy(&map[delty(&ns.range, cy)][deltx(&ns.range, cx) * 2],
-	       routech[i][0],
-	       3);
+	       routech[i], 3);
 	cx = xnorm(cx + diroff[i][0]);
 	cy = ynorm(cy + diroff[i][1]);
     }
diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c
index 0004a0742..a4eab2059 100644
--- a/src/lib/commands/rout.c
+++ b/src/lib/commands/rout.c
@@ -98,7 +98,7 @@ rout(void)
 	p = &map[ns.dy][ns.dx * 2];
 	if ((dir = sect.sct_del[i_del] & 0x7) &&
 	    nstr_exec(cond, ncond, &sect))
-	    memcpy(p, routech[dir][0], 3);
+	    memcpy(p, routech[dir], 3);
 	p[1] = dchr[sect.sct_type].d_mnem;
     }
     for (row = 0, y = ns.range.ly; row < ns.range.height; y++, row++) {
diff --git a/src/lib/global/dir.c b/src/lib/global/dir.c
index 9fa76ec0c..c08958c81 100644
--- a/src/lib/global/dir.c
+++ b/src/lib/global/dir.c
@@ -63,12 +63,6 @@ signed char dirindex[] = {
 };
 
 /* must agree with dirch[] and DIR_ defines */
-char *routech[][2] = {
-    {"   ", "$ $"},
-    {"  /", "$ /"},
-    {"  >", "$ >"},
-    {"  \\", "$ \\"},
-    {"/  ", "/ $"},
-    {"<  ", "< $"},
-    {"\\  ", "\\ $"}
+char *routech[] = {
+    "   ", "  /", "  >","  \\","/  ","<  ","\\  "
 };