diff --git a/src/common/kernel/order.c b/src/common/kernel/order.c index fb6ef33d8..5d1eeeb5b 100644 --- a/src/common/kernel/order.c +++ b/src/common/kernel/order.c @@ -98,7 +98,7 @@ free_orders(order ** olist) order * parse_order(const char * s, const struct locale * lang) { - while (!isalnum(*(unsigned char*)s)) ++s; + while (*s && !isalnum(*(unsigned char*)s) && !ispunct(*(unsigned char*)s)) ++s; if (*s==0) return NULL; else { const char * sptr; diff --git a/src/res/eressea.xml b/src/res/eressea.xml index 4e1df2c15..fc7b6b181 100644 --- a/src/res/eressea.xml +++ b/src/res/eressea.xml @@ -40,6 +40,10 @@ eressea-server@eressea.upb.de eressea-server@eressea.upb.de + + Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an eressea-server@eressea.upb.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports. + Remember to send your orders to eressea-server@eressea.upb.de with the subject ERESSEA ORDERS. + ERESSEA BEFEHLE ERESSEA ORDERS diff --git a/src/res/eressea/de/strings.xml b/src/res/eressea/de/strings.xml index 68ce017ad..ced28140a 100644 --- a/src/res/eressea/de/strings.xml +++ b/src/res/eressea/de/strings.xml @@ -1,8 +1,5 @@ - - Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an eressea-server@eressea.upb.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports. - Die ersten beiden Züge mußt du abgeben, sonst wird deine Partei sofort wieder gelöscht, um Karteileichen zu vermeiden. diff --git a/src/res/eressea/en/strings.xml b/src/res/eressea/en/strings.xml index a90292880..e87c445f3 100644 --- a/src/res/eressea/en/strings.xml +++ b/src/res/eressea/en/strings.xml @@ -1,7 +1,4 @@ - - Remember to send your orders to eressea-server@eressea.upb.de with the subject ERESSEA ORDERS. - If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea. diff --git a/src/res/hse4.xml b/src/res/hse4.xml index 257cfe9d0..1caed6c28 100644 --- a/src/res/hse4.xml +++ b/src/res/hse4.xml @@ -44,6 +44,10 @@ + + Bitte denke daran, deine Befehle mit dem Betreff ERESSEA BEFEHLE an hse-server@eressea.de zu senden. Am besten, du verwendest die Befehlsvorlage am Ende des Reports. + Remember to send your orders to hse-server@eressea.de with the subject ERESSEA ORDERS. + hse-server@eressea.de hse-server@eressea.de diff --git a/src/scripts/hse3-run.lua b/src/scripts/hse3-run.lua index 2282181ae..9af70c9f3 100644 --- a/src/scripts/hse3-run.lua +++ b/src/scripts/hse3-run.lua @@ -52,8 +52,6 @@ function process(orders) plan_monsters() process_orders() - refresh_pool() - write_passwords() write_reports() diff --git a/src/scripts/hse4-run.lua b/src/scripts/hse4-run.lua index b27a4ce49..54b97499f 100644 --- a/src/scripts/hse4-run.lua +++ b/src/scripts/hse4-run.lua @@ -32,6 +32,12 @@ function write_emails() end end +function refresh_pool() + for f in factions() do + f:add_item("money", 50) + end +end + function process(orders) file = "" .. get_turn() if read_game(file)~=0 then @@ -46,6 +52,8 @@ function process(orders) plan_monsters() process_orders() + refresh_pool() + write_passwords() write_reports()