From 21b617c973d59184e70c3a44c8d78d5b8da5a4e8 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 22 Jan 2017 20:32:54 +0100
Subject: [PATCH] fix game_name, remove it from rules

---
 conf/e2/config.json     | 2 --
 conf/e3/config.json     | 2 --
 conf/e4/config.json     | 2 --
 res/core/de/strings.xml | 2 --
 src/kernel/config.c     | 2 +-
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/conf/e2/config.json b/conf/e2/config.json
index ce823a33d..ca157f501 100644
--- a/conf/e2/config.json
+++ b/conf/e2/config.json
@@ -8,8 +8,6 @@
         "jsreport"
     ],
     "settings": {
-        "game.id": 2,
-        "game.name": "Eressea",
         "orders.default": "work",
         "NewbieImmunity": 8,
         "modules.wormholes": true,
diff --git a/conf/e3/config.json b/conf/e3/config.json
index 30bc7e599..fd533070e 100644
--- a/conf/e3/config.json
+++ b/conf/e3/config.json
@@ -25,8 +25,6 @@
         "jsreport"
     ],
     "settings": {
-        "game.id": 3,
-        "game.name": "E3",
         "orders.default": "work",
         "database.gameid": 7,
         "NewbieImmunity": 4,
diff --git a/conf/e4/config.json b/conf/e4/config.json
index cbe273af6..91961258a 100644
--- a/conf/e4/config.json
+++ b/conf/e4/config.json
@@ -25,8 +25,6 @@
         "jsreport"
     ],
     "settings": {
-        "game.id": 4,
-        "game.name": "Deveron",
         "orders.default": "work",
         "database.gameid": 7,
         "NewbieImmunity": 4,
diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index 7d31fc678..bccfdd165 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -6,12 +6,10 @@
     _x: preposition (15 /Schlumpf/schwerter)
     _a: including article (ein Schlumpf, a smurf)
    -->
-  <strings>
     <string name="mailcmd">
       <text locale="de">BEFEHLE</text>
       <text locale="en">ORDERS</text>
     </string>
-  </strings>
   <string name="vortex">
     <text locale="de">Wirbel</text>
     <text locale="en">vortex</text>
diff --git a/src/kernel/config.c b/src/kernel/config.c
index c7bc71cdf..c2db29f22 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -814,7 +814,7 @@ const char * game_name_upper(void)
     char *r = result;
     const char *param = game_name();
     const char *c = param;
-    while (*c && (r-result)<sizeof(result)) {
+    while (*c && (result+sizeof(result))>r) {
         *r++ = (char)toupper(*c++);
     }
     *r = '\0';