From 250e086eb1a00912891d344f15eba00a1d1a3889 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 25 Oct 2009 22:22:27 +0000
Subject: [PATCH] http://bugs.eressea.de/view.php?id=1653

---
 src/common/kernel/move.c | 7 +++++--
 src/common/kernel/unit.c | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index 2d7818948..7624d37a9 100644
--- a/src/common/kernel/move.c
+++ b/src/common/kernel/move.c
@@ -1072,8 +1072,11 @@ cycle_route(order * ord, unit *u, int gereist)
 		}
 	}
 
-	strcat(neworder, tail);
-  norder = create_order(K_ROUTE, u->faction->locale, "%s", neworder);
+  if (neworder[0]) {
+    norder = create_order(K_ROUTE, u->faction->locale, "%s %s", neworder, tail);
+  } else {
+    norder = create_order(K_ROUTE, u->faction->locale, "%s", tail);
+  }
   replace_order(&u->orders, ord, norder);
   free_order(norder);
 }
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index f5672ab3b..ab6b7613c 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -977,6 +977,7 @@ transfermen(unit * u, unit * u2, int n)
         remove_skill(u2, sk);
         sn = NULL;
       }
+      assert(u2->number!=0 || (sn->level==sv->level && sn->weeks==sv->weeks));
     }
     a = a_find(u->attribs, &at_effect);
     while (a && a->type==&at_effect) {