From 733c754e0f1cca7bb656cb5a92550ac962f48ce0 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 25 Mar 2017 14:15:01 +0100
Subject: [PATCH] rename some configuration options. add them to the valid keys
 for eressea.ini, too.

---
 conf/e2/config.json | 4 +---
 conf/e3/config.json | 4 +---
 src/creport.c       | 2 +-
 src/gmtool.c        | 4 ++--
 src/main.c          | 2 ++
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/conf/e2/config.json b/conf/e2/config.json
index f9f9b2df0..46ee01497 100644
--- a/conf/e2/config.json
+++ b/conf/e2/config.json
@@ -21,9 +21,7 @@
         "GiveRestriction": 3,
         "hunger.long": true,
         "init_spells": 0,
-        "world.era": 2,
-        "seed.population.min": 8,
-        "seed.population.max": 8,
+        "game.era": 2,
         "rules.reserve.twophase": true,
         "rules.give.max_men": -1,
         "rules.check_overload": false,
diff --git a/conf/e3/config.json b/conf/e3/config.json
index a42961e03..beb45f35d 100644
--- a/conf/e3/config.json
+++ b/conf/e3/config.json
@@ -51,9 +51,7 @@
         "recruit.allow_merge": true,
         "study.expensivemigrants": true,
         "study.speedup": 2,
-        "world.era": 3,
-        "seed.population.min": 8,
-        "seed.population.max": 8,
+        "game.era": 3,
         "rules.reserve.twophase": true,
         "rules.owners.force_leave": false,
         "rules.wage.function": 2,
diff --git a/src/creport.c b/src/creport.c
index 14e6e8faa..113bb70ca 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -1501,7 +1501,7 @@ report_computer(const char *filename, report_context * ctx, const char *bom)
     static int rc_cache;
 
     if (era < 0) {
-        era = config_get_int("world.era", 1);
+        era = config_get_int("game.era", 1);
     }
     if (F == NULL) {
         perror(filename);
diff --git a/src/gmtool.c b/src/gmtool.c
index 148aafe6d..674e139f7 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -902,8 +902,8 @@ static void handlekey(state * st, int c)
             new_players = read_newfactions(sbuffer);
         }
         cnormalize(&st->cursor, &nx, &ny);
-        minpop = config_get_int("seed.population.min", 8);
-        maxpop = config_get_int("seed.population.max", minpop);
+        minpop = config_get_int("editor.population.min", 8);
+        maxpop = config_get_int("editor.population.max", minpop);
         if (maxpop > minpop) {
             n = rng_int() % (maxpop - minpop) + minpop;
         }
diff --git a/src/main.c b/src/main.c
index a9a8339d4..7b1c62c38 100644
--- a/src/main.c
+++ b/src/main.c
@@ -82,9 +82,11 @@ static const char * valid_keys[] = {
     "game.memcheck",
     "game.email",
     "game.mailcmd",
+    "game.era",
     "game.sender",
     "editor.color",
     "editor.codepage",
+    "editor.population.",
     "lua.",
     NULL
 };