From 8cfcffc4aac2ee3eb543a799064c2bbde12ae6f0 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Mon, 13 Mar 2017 09:19:37 +0100
Subject: [PATCH] remove data_turn and gamename from global settings. make
 run-turn.sh work without valgrind

---
 conf/eressea.ini    | 2 --
 src/kernel/config.c | 6 ++----
 src/kernel/config.h | 2 --
 src/kernel/save.c   | 3 +--
 src/summary.c       | 1 -
 tests/run-turn.sh   | 5 +++--
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/conf/eressea.ini b/conf/eressea.ini
index b6db180ca..c745631ad 100644
--- a/conf/eressea.ini
+++ b/conf/eressea.ini
@@ -2,11 +2,9 @@
 email = eressea-server@kn-bremen.de
 sender = Eressea Server
 name = Eressea
-base                           = .
 report                         = reports
 verbose                        = 0
 lomem                          = 0
-debug                          = 0
 memcheck                       = 0
 locales                        = de,en
 
diff --git a/src/kernel/config.c b/src/kernel/config.c
index 67dddb11e..3bbb0fd69 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -93,9 +93,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <errno.h>
 #include <sys/stat.h>
 
-struct settings global = {
-    "Eressea",                    /* gamename */
-};
+struct settings global;
 
 bool lomem = false;
 int turn = -1;
@@ -841,7 +839,7 @@ void free_gamedata(void)
 const char * game_name(void)
 {
     const char * param = config_get("game.name");
-    return param ? param : global.gamename;
+    return param ? param : "Eressea";
 }
 
 const char * game_mailcmd(void)
diff --git a/src/kernel/config.h b/src/kernel/config.h
index 1fc70cd5b..86eda7c5c 100644
--- a/src/kernel/config.h
+++ b/src/kernel/config.h
@@ -108,9 +108,7 @@ extern "C" {
 
     /* globale settings des Spieles */
     typedef struct settings {
-        const char *gamename;
         struct attrib *attribs;
-        unsigned int data_turn;
         void *vm_state;
         struct global_functions {
             int(*wage) (const struct region * r, const struct faction * f,
diff --git a/src/kernel/save.c b/src/kernel/save.c
index 5be078d8a..2e1686f2a 100644
--- a/src/kernel/save.c
+++ b/src/kernel/save.c
@@ -244,7 +244,7 @@ static faction *factionorders(void)
 
          /* TODO: +1 ist ein Workaround, weil cturn erst in process_orders
           * incrementiert wird. */
-        f->lastorders = global.data_turn + 1;
+        f->lastorders = turn + 1;
 
     }
     else {
@@ -1633,7 +1633,6 @@ int read_game(gamedata *data) {
     }
     read_attribs(data, &global.attribs, NULL);
     READ_INT(store, &turn);
-    global.data_turn = turn;
     log_debug(" - reading turn %d", turn);
     rng_init(turn);
     READ_INT(store, NULL);          /* max_unique_id = ignore */
diff --git a/src/summary.c b/src/summary.c
index aafdfe081..c18e54ee5 100644
--- a/src/summary.c
+++ b/src/summary.c
@@ -76,7 +76,6 @@ int update_nmrs(void)
 {
     int i, newplayers = 0;
     faction *f;
-    int turn = global.data_turn;
     int timeout = NMRTimeout();
 
     if (timeout>0) {
diff --git a/tests/run-turn.sh b/tests/run-turn.sh
index 9297278c3..fd6eb63ee 100755
--- a/tests/run-turn.sh
+++ b/tests/run-turn.sh
@@ -28,12 +28,12 @@ while [ ! -d $ROOT/.git ]; do
   ROOT=`dirname $ROOT`
 done
 
-set -e
 cd $ROOT/tests
 setup
 cleanup
 VALGRIND=`which valgrind`
 SERVER=../Debug/eressea/eressea
+set -e
 if [ -n "$VALGRIND" ]; then
 SUPP=../share/ubuntu-12_04.supp
 SERVER="$VALGRIND --track-origins=yes --gen-suppressions=all --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
@@ -53,6 +53,7 @@ assert_grep_count reports/$CRFILE '^BURG' 1
 assert_grep_count reports/$CRFILE '^EINHEIT' 2
 assert_grep_count reports/$CRFILE '^GEGENSTAENDE' 2
 
+assert_grep_count reports/185-heg.cr '185;Runde' 1
 assert_grep_count reports/185-heg.cr ';Baeume' 4
 assert_grep_count reports/185-heg.cr '"B.ume";type' 4
 assert_grep_count reports/185-heg.cr '"Pferde";type' 6
@@ -62,4 +63,4 @@ assert_grep_count reports/185-heg.cr '"neighbour";visibility' 11
 assert_grep_count reports/185-6rLo.cr '^EINHEIT' 2
 assert_grep_count reports/185-6rLo.cr '^REGION' 13
 echo "integration tests: PASS"
-#cleanup
+cleanup