From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 25 Aug 2013 15:01:02 +0000 (-0400)
Subject: More boolean conversions.  No logic changes.
X-Git-Tag: 1.11~19
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=01844a3413c1b0d30338393db28fc2c62544275a;p=vms-empire.git

More boolean conversions.  No logic changes.
---

diff --git a/compmove.c b/compmove.c
index eb9ab2d..3695768 100644
--- a/compmove.c
+++ b/compmove.c
@@ -975,7 +975,7 @@ move_objective(piece_info_t *obj, path_map_t pathmap[],
 {
     char *terrain;
     int d;
-    int reuse; /* true iff we should reuse old map */
+    bool reuse; /* true iff we should reuse old map */
     loc_t old_loc;
     loc_t old_dest;
 	
@@ -989,11 +989,11 @@ move_objective(piece_info_t *obj, path_map_t pathmap[],
     old_dest = new_loc; /* and where we're going */
 	
     d = dist (new_loc, obj->loc);
-    reuse = 1; /* try to reuse unless we learn otherwise */
+    reuse = true; /* try to reuse unless we learn otherwise */
 	
     if (comp_map[new_loc].contents == ' ' && d == 2) { /* are we exploring? */
 	vmap_mark_adjacent (pathmap, obj->loc);
-	reuse = 0;
+	reuse = false;
     }
     else vmap_mark_path (pathmap, comp_map, new_loc); /* find routes to destination */
 	
@@ -1010,7 +1010,7 @@ move_objective(piece_info_t *obj, path_map_t pathmap[],
     if (new_loc == obj->loc /* path is blocked? */
 	&& (obj->type != ARMY || !obj->ship)) { /* don't unblock armies on a ship */
 	vmap_mark_near_path (pathmap, obj->loc);
-	reuse = 0;
+	reuse = false;
 	new_loc = vmap_find_dir (pathmap, comp_map, obj->loc,
 				 terrain, adj_list);
     }
@@ -1019,7 +1019,7 @@ move_objective(piece_info_t *obj, path_map_t pathmap[],
     if (new_loc == obj->loc && map[obj->loc].cityp != NULL
 	&& obj->type == ARMY) {
 	new_loc = move_away (comp_map, obj->loc, "+");
-	reuse = 0;
+	reuse = false;
     }
     if (new_loc == obj->loc) {
 	obj->moved = piece_attr[obj->type].speed;
diff --git a/term.c b/term.c
index ed70f64..08ce6b4 100644
--- a/term.c
+++ b/term.c
@@ -150,7 +150,7 @@ info(char *a, char *b, char *c)
 void
 set_need_delay(void)
 {
-    need_delay = 1;
+    need_delay = true;
 }
 
 void
@@ -159,7 +159,8 @@ comment (char *fmt, ...)
     va_list ap;
 
     va_start(ap, fmt);
-    if (need_delay) delay ();
+    if (need_delay)
+	delay ();
     topmsg (1, "");
     topmsg (2, "");
     vtopmsg (3, fmt, ap);
@@ -175,7 +176,8 @@ pdebug(char *fmt, ...)
     if (!print_debug) return;
 
     va_start(ap, fmt);
-    if (need_delay) delay ();
+    if (need_delay)
+	delay ();
     topmsg (1, "");
     topmsg (2, "");
     vtopmsg (3, fmt, ap);