From 1dcb14cfb96645b52549a32eaf1f407e331e99cc Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 22 Aug 2014 20:15:44 +0200
Subject: [PATCH 1/3] Revert "silver has a weight of 1:
 http://bugs.eressea.de/view.php?id=2013"

This reverts commit 911992b04dd8eebab70d87993dd2b71dc8cb12f8.
---
 res/core/common/items.xml | 4 ----
 res/items.xml             | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 res/items.xml

diff --git a/res/core/common/items.xml b/res/core/common/items.xml
index c8910e695..d867a3126 100644
--- a/res/core/common/items.xml
+++ b/res/core/common/items.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <resources>
 
-  <resource name="money">
-    <item weight="1"/>
-  </resource>
-
   <resource name="ao_healing" appearance="amulet">
     <item weight="0" score="6000"/>
   </resource>
diff --git a/res/items.xml b/res/items.xml
new file mode 100644
index 000000000..e8fa7246a
--- /dev/null
+++ b/res/items.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<items>
+</items>

From b2dc6a3a9d6058198c76f1c4a03234479f0bbbfe Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 23 Aug 2014 00:35:06 +0200
Subject: [PATCH 2/3] fix MAKE TEMP, for real this time. I hate skip_token and
 all that stuff.

---
 res/core/en/strings.xml | 2 +-
 s/preview               | 2 +-
 src/laws.c              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/core/en/strings.xml b/res/core/en/strings.xml
index c58d11918..f91b1d9a7 100644
--- a/res/core/en/strings.xml
+++ b/res/core/en/strings.xml
@@ -1476,7 +1476,7 @@
     <text locale="en">MAKE</text>
   </string>
   <string name="maketemp">
-    <text locale="de">MAKETEMP</text>
+    <text locale="en">MAKETEMP</text>
   </string>
   <string name="move">
     <text locale="en">MOVE</text>
diff --git a/s/preview b/s/preview
index 9db46f7cb..a8893cc11 100755
--- a/s/preview
+++ b/s/preview
@@ -87,7 +87,7 @@ zip="$turn-$1.zip"
 zip -q -u $zip $turn-$1.?r
 email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
 echo "sending reports to $1 / $email"
-cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $GAME Partei $1" -a $zip -- $email
+cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
 }
 
 game=0
diff --git a/src/laws.c b/src/laws.c
index d24ae795a..fe2ec329b 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -3627,6 +3627,8 @@ void new_units(void)
                         }
                         continue;
                     }
+                    init_tokens(makeord);
+                    skip_token();
                     alias = getid();
 
                     token = getstrtoken();

From f1d78b4b84fd097de3777761c5573765cec92ab2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 24 Aug 2014 00:29:19 +0200
Subject: [PATCH 3/3] fix null-pointer crash.

---
 src/kernel/order.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/kernel/order.c b/src/kernel/order.c
index 2c1e7ee89..80991feab 100644
--- a/src/kernel/order.c
+++ b/src/kernel/order.c
@@ -541,7 +541,8 @@ char *write_order(const order * ord, char *buffer, size_t size)
         keyword_t kwd = ORD_KEYWORD(ord);
         if (kwd == NOKEYWORD) {
             const char *text = ORD_STRING(ord);
-            strlcpy(buffer, (const char *)text, size);
+            if (text) strlcpy(buffer, (const char *)text, size);
+            else buffer[0] = 0;
         }
         else {
             get_command(ord, buffer, size);