From 06ba427a779558e7f79c64060c822f3c545ecaa4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 26 Nov 2016 17:17:14 +0100 Subject: [PATCH 1/2] fix VS2015 build: config.h not found --- src/creport.test.c | 1 - src/game.pkg | 1 - src/game.pkg.c | 1 - src/kernel/order.test.c | 1 - src/report.test.c | 1 - src/reports.test.c | 1 - 6 files changed, 6 deletions(-) diff --git a/src/creport.test.c b/src/creport.test.c index 3a84ea566..72669e99f 100644 --- a/src/creport.test.c +++ b/src/creport.test.c @@ -1,5 +1,4 @@ #include -#include #include "creport.h" #include "move.h" #include "travelthru.h" diff --git a/src/game.pkg b/src/game.pkg index 88b3bda9a..dc2b324e4 100644 --- a/src/game.pkg +++ b/src/game.pkg @@ -1,6 +1,5 @@ $#undef tolua_reg_types $#define tolua_reg_types tolua_reg_types_game -$#include "config.h" $#include "bind_eressea.h" module eressea { diff --git a/src/game.pkg.c b/src/game.pkg.c index abd7832ca..30671021d 100644 --- a/src/game.pkg.c +++ b/src/game.pkg.c @@ -20,7 +20,6 @@ LUALIB_API int luaopen_game (lua_State* tolua_S); #undef tolua_reg_types #define tolua_reg_types tolua_reg_types_game -#include "config.h" #include "bind_eressea.h" /* function to register type */ diff --git a/src/kernel/order.test.c b/src/kernel/order.test.c index 635e6e078..f5eb51c6f 100644 --- a/src/kernel/order.test.c +++ b/src/kernel/order.test.c @@ -1,5 +1,4 @@ #include -#include #include #include "order.h" diff --git a/src/report.test.c b/src/report.test.c index cf074b284..202458db5 100644 --- a/src/report.test.c +++ b/src/report.test.c @@ -1,5 +1,4 @@ #include -#include #include "report.h" #include "move.h" #include "travelthru.h" diff --git a/src/reports.test.c b/src/reports.test.c index bc89bb4b4..c9fe39c19 100644 --- a/src/reports.test.c +++ b/src/reports.test.c @@ -1,5 +1,4 @@ #include -#include #include "reports.h" #include "move.h" From bf70792da61e21fd85f5b74cd5f314b1358923ec Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 27 Nov 2016 16:07:46 +0100 Subject: [PATCH 2/2] make kn-bremen.de official email address --- conf/e2/config.xml | 8 ++++---- conf/e3/config.xml | 8 ++++---- conf/e4/config.xml | 8 ++++---- process/orders-accept | 6 +++--- process/orders-process | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/e2/config.xml b/conf/e2/config.xml index f7f227824..0441a46f6 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -54,14 +54,14 @@ - eressea-server@eressea.de - eressea-server@eressea.de + eressea-server@eressea.kn-bremen.de + eressea-server@eressea.kn-bremen.de Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA 2 BEFEHLE an eressea-server@eressea.de zu senden. + ERESSEA 2 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. Remember to send your orders to - eressea-server@eressea.de with the subject ERESSEA 2 ORDERS. + eressea-server@eressea.kn-bremen.de with the subject ERESSEA 2 ORDERS. ERESSEA 2 BEFEHLE diff --git a/conf/e3/config.xml b/conf/e3/config.xml index d337ead42..c8c5dbb06 100644 --- a/conf/e3/config.xml +++ b/conf/e3/config.xml @@ -46,14 +46,14 @@ - eressea-server@eressea.de - eressea-server@eressea.de + eressea-server@eressea.kn-bremen.de + eressea-server@eressea.kn-bremen.de Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA 3 BEFEHLE an eressea-server@eressea.de zu senden. + ERESSEA 3 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. Remember to send your orders to - eressea-server@eressea.de with the subject E3 ORDERS. + eressea-server@eressea.kn-bremen.de with the subject E3 ORDERS. ERESSEA 3 BEFEHLE diff --git a/conf/e4/config.xml b/conf/e4/config.xml index 5c99f7d7e..b188f7d79 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -47,14 +47,14 @@ - eressea-server@eressea.de - eressea-server@eressea.de + eressea-server@eressea.kn-bremen.de + eressea-server@eressea.kn-bremen.de Bitte denke daran, deine Befehle mit dem Betreff - ERESSEA 4 BEFEHLE an eressea-server@eressea.de zu senden. + ERESSEA 4 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. Remember to send your orders to - eressea-server@eressea.de with the subject ERESSEA 4 ORDERS. + eressea-server@eressea.kn-bremen.de with the subject ERESSEA 4 ORDERS. ERESSEA 4 BEFEHLE diff --git a/process/orders-accept b/process/orders-accept index e90c3d48f..151f0b196 100755 --- a/process/orders-accept +++ b/process/orders-accept @@ -30,15 +30,15 @@ rejecthtml = True games = [ { - "from" : "Eressea Server ", + "from" : "Eressea Server ", "prefix" : "Eressea" }, { - "from" : "Eressea Server ", + "from" : "Eressea Server ", "prefix": "E3" }, { - "from" : "Eressea Server ", + "from" : "Eressea Server ", "prefix": "E4" }, ] diff --git a/process/orders-process b/process/orders-process index a4d932648..753385e2e 100755 --- a/process/orders-process +++ b/process/orders-process @@ -65,7 +65,7 @@ messages = { # base directory for all your games: rootdir = "/home/eressea/eressea" -frommail = "Eressea Server " +frommail = "Eressea Server " orderbase = "orders.dir" sendmail = True maxlines = 25