From c0fcf15184a35acd010e8339c40c6bed49d81b82 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 16 Jul 2005 17:18:15 +0000
Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=565 Neue Defaults
 entfernen alte lange Befehle, nicht kurze.

---
 src/common/gamecode/laws.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index d54dc60cf..f13c2ae17 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -3767,16 +3767,31 @@ monthly_healing(void)
   }
 }
 
+static void
+remove_exclusive(order ** ordp) 
+{
+  while (*ordp) {
+    order * ord = *ordp;
+    if (is_exclusive(ord)) {
+      *ordp = ord->next;
+      ord->next = NULL;
+      free_order(ord);
+    } else {
+      ordp = &ord->next;
+    }
+  }
+}
+
 static void
 defaultorders (void)
 {
   region *r;
   for (r=regions;r;r=r->next) {
-#ifndef LASTORDER
-    boolean neworders = false;
-#endif
     unit *u;
     for (u=r->units;u;u=u->next) {
+#ifndef LASTORDER
+      boolean neworders = false;
+#endif
       order ** ordp = &u->orders;
       while (*ordp!=NULL) {
         order * ord = *ordp;
@@ -3791,8 +3806,10 @@ defaultorders (void)
           if (new_order) set_order(&u->lastorder, new_order);
 #else
           if (!neworders) {
+            /* lange Befehle aus orders und old_orders löschen zu gunsten des neuen */
+            remove_exclusive(&u->orders);
+            remove_exclusive(&u->old_orders);
             neworders = true;
-            free_orders(&u->old_orders);
           }
           if (new_order) addlist(&u->old_orders, new_order);
 #endif