From 627b87790b201abcef102d47f953e890f79c5276 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Wed, 29 Jul 2009 18:34:27 +0000
Subject: [PATCH] cosmetic fixes regarding alliances.

---
 src/common/gamecode/creport.c | 1 -
 src/common/gamecode/report.c  | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 0c896f916..7e6adf07d 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -947,7 +947,6 @@ show_alliances_cr(FILE * F, const faction * f)
     fprintf(F, "ALLIANCE %d\n", al->id);
     fprintf(F, "\"%s\";name\n", al->name);
     fprintf(F, "%d;leader\n", al->leader->no);
-    fprintf(F, "%d;leader\n", al->leader->no);
   }
 }
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index d25db0ac6..a5d8bde31 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -671,7 +671,7 @@ nr_unit(FILE * F, const faction * f, const unit * u, int indent, int mode)
 
   if (u->faction == f) {
     marker = '*';
-  } else if (u->faction->alliance == f->alliance && f->alliance) {
+  } else if ALLIED(u->faction, f) {
     marker = 'o';
   } else if (a_otherfaction && f != u->faction && get_otherfaction(a_otherfaction) == f
     && !fval(u, UFL_PARTEITARNUNG)) {
@@ -1703,7 +1703,8 @@ list_address(FILE * F, const faction * uf, const faction_list * seenfactions)
       char label = '-';
 
       sprintf(buf, "%s: %s; %s", factionname(f), f->email, f->banner?f->banner:"");
-      if (ALLIED(uf, f)) label = '*';
+      if (uf==f) label = '*';
+      else if (ALLIED(uf, f)) label = 'o';
       else if (alliedfaction(NULL, uf, f, HELP_ALL)) label = '+';
       rparagraph(F, buf, 4, 0, label);