fix gmtool and setup script to match the GM guide document.

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

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;

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;