From ad14e45341825d7420479d91874b4ae960b06cfc Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 20 May 2008 08:39:56 +0000
Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=1427 "Angegriffene
 Einheiten auf Schiffen an Land fliehen nicht"

Also:
- printing the monster faction in reports
---
 src/common/gamecode/creport.c | 4 ++--
 src/common/kernel/battle.c    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 62dafde1b..d02c04cec 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -995,10 +995,10 @@ cr_find_address(FILE * F, const faction * uf, const faction_list * addresses)
   const faction_list * flist = addresses;
   while (flist!=NULL) {
     const faction * f = flist->data;
-    if (uf!=f && !is_monsters(f)) {
+    if (uf!=f) {
       fprintf(F, "PARTEI %d\n", f->no);
       fprintf(F, "\"%s\";Parteiname\n", f->name);
-      fprintf(F, "\"%s\";email\n", f->email);
+      if (f->email) fprintf(F, "\"%s\";email\n", f->email);
       fprintf(F, "\"%s\";banner\n", f->banner);
       fprintf(F, "\"%s\";locale\n", locale_name(f->locale));
       if (f->alliance!=NULL && f->alliance==uf->alliance) {
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index fde66edb4..5bea1db47 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -3898,7 +3898,6 @@ battle_flee(battle * b)
         int runhp = min(600,(int)(0.9+unit_max_hp(u)*hpflee(u->status)));
         if (fval(u->race, RCF_UNDEAD) || u->race == new_race[RC_SHADOWKNIGHT]) continue;
 
-        if (u->ship) continue;
         dt.fighter = fig;
 #ifndef SIMPLE_ESCAPE
         if (!fig->run.region) fig->run.region = fleeregion(u);