From d57a57155c1536a974e4b5bef5d7c41730ab70f0 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sat, 20 Jan 2007 01:42:39 +0000
Subject: [PATCH] (pr_leader_change, get_leader, switch_leader): Move
 pr_leader_change(), get_leader() and switch_leader() from marc.c to navi.c.

---
 src/lib/commands/marc.c | 35 -----------------------------------
 src/lib/commands/navi.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index bd8c639d..31e708b7 100644
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -194,38 +194,3 @@ march(void)
     }
     return RET_OK;
 }
-
-void
-pr_leader_change(struct empobj *leader)
-{
-    pr("Changing %s to %s\n",
-	leader->ef_type == EF_SHIP ? "flagship" : "leader",
-	obj_nameof(leader));
-}
-
-struct empobj *
-get_leader(struct emp_qelem *list)
-{
-    return &((struct ulist *)(list->q_back))->unit.gen;
-}
-
-void
-switch_leader(struct emp_qelem *list, int uid)
-{
-    struct emp_qelem *qp, *save;
-    struct ulist *ulp;
-
-    if (QEMPTY(list))
-	return;
-
-    save = qp = list->q_back;
-    do {
-        emp_remque(qp);
-        emp_insque(qp, list);
-        qp = list->q_back;
-        ulp = (struct ulist *)qp;
-        if (ulp->unit.gen.uid == uid || uid == -1)
-            break;
-    } while (list->q_back != save);
-}
-
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index f1715105..cee3c661 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -295,3 +295,37 @@ nav_map(int x, int y, int show_designations)
 	pr("%s\n", wmap[i]);
     return RET_OK;
 }
+
+void
+pr_leader_change(struct empobj *leader)
+{
+    pr("Changing %s to %s\n",
+	leader->ef_type == EF_SHIP ? "flagship" : "leader",
+	obj_nameof(leader));
+}
+
+struct empobj *
+get_leader(struct emp_qelem *list)
+{
+    return &((struct ulist *)(list->q_back))->unit.gen;
+}
+
+void
+switch_leader(struct emp_qelem *list, int uid)
+{
+    struct emp_qelem *qp, *save;
+    struct ulist *ulp;
+
+    if (QEMPTY(list))
+	return;
+
+    save = qp = list->q_back;
+    do {
+        emp_remque(qp);
+        emp_insque(qp, list);
+        qp = list->q_back;
+        ulp = (struct ulist *)qp;
+        if (ulp->unit.gen.uid == uid || uid == -1)
+            break;
+    } while (list->q_back != save);
+}