From dc0897b122b97cd04b72b96da3bd07d9c6a5c990 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 10 May 2015 13:41:48 -0700
Subject: [PATCH] fix gmtool and setup script to match the GM guide document.

---
 s/setup                | 9 +++++----
 src/gmtool.c           | 2 ++
 src/modules/autoseed.c | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/s/setup b/s/setup
index 1cb6a1867..69584d53b 100755
--- a/s/setup
+++ b/s/setup
@@ -91,7 +91,8 @@ ini_add lua install $SOURCE
 ini_add lua paths $SOURCE/scripts:$SOURCE/lunit
 ini_add lua rules $rules
 
-ln -f $SOURCE/bin/eressea
-ln -f $SOURCE/scripts/run-turn.lua
-ln -f $SOURCE/scripts/reports.lua
-ln -f $SOURCE/scripts/config.lua
+touch newfactions
+ln -sf $SOURCE/bin/eressea
+ln -sf $SOURCE/scripts/run-turn.lua
+ln -sf $SOURCE/scripts/reports.lua
+ln -sf $SOURCE/scripts/config.lua
diff --git a/src/gmtool.c b/src/gmtool.c
index 91134e8b5..fc9fccdb9 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -929,6 +929,7 @@ static void handlekey(state * st, int c)
             }
         }
         break;
+    case 'f':
     case 0x14:                 /* C-t */
         terraform_at(&st->cursor, select_terrain(st, NULL));
         st->modified = 1;
@@ -1011,6 +1012,7 @@ static void handlekey(state * st, int c)
         statusline(st->wnd_status->handle, "tag-");
         doupdate();
         switch (getch()) {
+        case 'f':
         case 't':
             terraform_selection(st->selected, select_terrain(st, NULL));
             st->modified = 1;
diff --git a/src/modules/autoseed.c b/src/modules/autoseed.c
index 44b93943c..eac860185 100644
--- a/src/modules/autoseed.c
+++ b/src/modules/autoseed.c
@@ -181,7 +181,7 @@ newfaction *read_newfactions(const char *filename)
         password[0] = '\0';
 
         if (sscanf(buf, "%54s %20s %8s %d %d %16s %d", email, race, lang, &bonus,
-            &subscription, password, &alliance) < 6)
+            &subscription, password, &alliance) < 3)
             break;
         if (email[0] == '\0')
             break;