From 9e81de406bec3dccf75a5c5b7f0d48054965b6c3 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Tue, 2 Sep 2014 07:24:55 +0200
Subject: [PATCH] version 3.2 remove regatta plane, it crashes all of a sudden.
 why is there a use of init_order here? that is a future feature.

---
 src/build.h       | 4 ++--
 src/kernel/save.c | 4 +++-
 src/laws.c        | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/build.h b/src/build.h
index bfc11ffe7..8be9fc2e8 100644
--- a/src/build.h
+++ b/src/build.h
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 1
-#define VERSION_BUILD 683
+#define VERSION_MINOR 2
+#define VERSION_BUILD 684
diff --git a/src/kernel/save.c b/src/kernel/save.c
index af608f4b1..e16e61161 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -1571,7 +1571,9 @@ int readgame(const char *filename, int backup)
             }
         }
         a_read(&store, &pl->attribs, pl);
-        addlist(&planes, pl);
+        if (pl->id != 1094969858) { // Regatta
+            addlist(&planes, pl);
+        }
     }
 
     /* Read factions */
diff --git a/src/laws.c b/src/laws.c
index 505dd91a7..34f8ca08b 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -3944,7 +3944,8 @@ void defaultorders(void)
                     char lbuf[8192];
                     order *new_order = 0;
                     const char *s;
-                    init_order(ord);
+                    init_tokens(ord);
+                    skip_token();
                     s = getstrtoken();
                     if (s) {
                         strcpy(lbuf, s);