rename some configuration options.

add them to the valid keys for eressea.ini, too.

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,

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,

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);

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;
         }

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
 };