From 18a9ad378e9c12658985ec11c210cece5c44dfae Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 15 Dec 2001 15:41:48 +0000
Subject: [PATCH] bugfix, "schicke" borders

---
 src/mapper/map_modify.c |  3 ++-
 src/mapper/map_partei.c |  3 ++-
 src/mapper/map_tools.c  |  3 ++-
 src/mapper/map_units.c  | 12 ++++++++----
 src/mapper/mapper.c     | 12 +++++++++---
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/mapper/map_modify.c b/src/mapper/map_modify.c
index 544b76185..e9c6f99f7 100644
--- a/src/mapper/map_modify.c
+++ b/src/mapper/map_modify.c
@@ -1071,7 +1071,8 @@ GetTerrain(region * r)
 	int q, y, i;
 	win = newwin(8, SX - 10, 2, 2);
 	wclear(win);
-	wborder(win, '|', '|', '-', '-', '.', '.', '`', '\'');
+/*	wborder(win, '|', '|', '-', '-', '.', '.', '`', '\'');*/
+	wborder(win, 0, 0, 0, 0, 0, 0, 0, 0);
 	wmove(win, 0, 3);
 	waddnstr(win, "< Terraform Region >", -1);
 	wrefresh(win);
diff --git a/src/mapper/map_partei.c b/src/mapper/map_partei.c
index 12b52cd10..4c76ceeb5 100644
--- a/src/mapper/map_partei.c
+++ b/src/mapper/map_partei.c
@@ -443,7 +443,8 @@ ModifyPartei(faction * f)
 		case 'r':
 			mywin = newwin(5, SX - 20, (SY - 5) / 2, (SX - 20) / 2);
 			wclear(mywin);
-			wborder(mywin, '|', '|', '-', '-', '.', '.', '`', '\'');
+			/*wborder(mywin, '|', '|', '-', '-', '.', '.', '`', '\'');*/
+			wborder(mywin, 0, 0, 0, 0, 0, 0, 0, 0);
 			Movexy(3, 0);
 			Addstr("< Rasse wählen >");
 			wrefresh(mywin);
diff --git a/src/mapper/map_tools.c b/src/mapper/map_tools.c
index d756f8676..4486a6fed 100644
--- a/src/mapper/map_tools.c
+++ b/src/mapper/map_tools.c
@@ -315,7 +315,8 @@ do_selection(selection * sel, const char * title, void (*perform)(selection *, v
 				wmove(wn, i + 1, 4);
 				waddnstr(wn, s->str, -1);
 			}
-			wborder(wn, '|', '|', '-', '-', '+', '+', '+', '+');
+			/*wborder(wn, '|', '|', '-', '-', '+', '+', '+', '+');*/
+			wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
 			wmove(wn, 0, 2);
 			sprintf(buf, "[ %s ]", title);
 			waddnstr(wn, buf, width);
diff --git a/src/mapper/map_units.c b/src/mapper/map_units.c
index 6709a4ff5..68b9c521a 100644
--- a/src/mapper/map_units.c
+++ b/src/mapper/map_units.c
@@ -247,7 +247,8 @@ modify_zauber(unit * u)
 	wn = newwin(L + 2, 50, (SY - L - 2) / 2, (SX - 50) / 2);
 
 	wclear(wn);
-	wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\'');
+	/* wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\''); */
+	wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
 	wmove(wn, 0, 3);
 	waddnstr(wn, "< Zauber >", -1);
 	for (i = 0; i < MAXSPELLS; i++) {
@@ -280,7 +281,8 @@ modify_zauber(unit * u)
 					wmove(wn, i + 1, 2);
 					wclrtoeol(wn);
 				}
-			wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\'');
+			/* wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\''); */
+				wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
 			wmove(wn, 0, 3);
 			waddnstr(wn, "< Zauber >", -1);
 		} else {
@@ -349,7 +351,8 @@ modify_talente(unit * u, region * r)
 	wn = newwin(L + 2, 40, (SY - L - 2) / 2, (SX - 40) / 2);
 
 	wclear(wn);
-	wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\'');
+	/* wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\''); */
+	wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
 	wmove(wn, 0, 3);
 	waddnstr(wn, "< Talente >", -1);
 	for (i = 0; i < MAXSKILLS; i++) {
@@ -379,7 +382,8 @@ modify_talente(unit * u, region * r)
 					wmove(wn, i + 1, 2);
 					wclrtoeol(wn);
 				}
-			wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\'');
+			/* wborder(wn, '|', '|', '-', '-', '.', '.', '`', '\''); */
+			wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
 			wmove(wn, 0, 3);
 			waddnstr(wn, "< Talente >", -1);
 		} else {
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 8e03599c2..78b14b7c8 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -73,7 +73,8 @@ extern void render_init(void);
 WINDOW * openwin(int b, int h, const char* t) {
 	WINDOW * win = newwin(h,b,(SY-(h))/2,(SX-(b))/2);
 	wclear(win);
-	wborder(win, '|','|','-','-','.','.','`','\'');
+	/* wborder(win, '|','|','-','-','.','.','`','\''); */
+	wborder(win, 0, 0, 0, 0, 0, 0, 0, 0);
 	if(t) {
 		wmove(win,0,3);
 		waddnstr(win,(char*)t,-1);
@@ -272,6 +273,11 @@ has_laen(region *r)
 	}
 	return false;
 }
+#else
+static boolean
+has_laen(region *r) {
+	return false;
+}
 #endif
 
 void
@@ -495,8 +501,8 @@ modify_block(void)
 	int c, s = 0;
 	region *r;
 	tagregion *t;
-	char *name;
-	int div;
+	char *name = NULL;
+	int div = 0;
 
 	win = openwin(70, 4, "< Tag-Regionen modifizieren >");
 	wmove(win, 1, 2);