Merge branch 'master' into develop

Conflicts:
	src/magic.c

conf/e3/locales.xml

@@ -4,7 +4,6 @@
   <xi:include href="config://core/de/strings.xml"/>
   <xi:include href="config://core/en/strings.xml"/>
   <xi:include href="config://game/strings.xml"/>
-  <xi:include href="config://game/messages.xml"/>
   <xi:include href="config://default/names-undead.xml"/>
   <xi:include href="config://default/names-skeletons.xml"/>
   <xi:include href="config://default/names-zombies.xml"/>

res/core/messages.xml

@@ -2033,6 +2033,13 @@
     <text locale="de">$if($isnull($mage),"Ein unentdeckter Magier",$unit($mage)) erschuf einen heiligen Hain von $int($amount) Schößlingen.</text>
     <text locale="en">$if($isnull($mage),"An unknown magician",$unit($mage)) created a holy forest of $int($amount) young trees.</text>
   </message>
+  <message name="raindance_effect" section="magic">
+    <type>
+      <arg name="mage" type="unit"/>
+    </type>
+    <text locale="de">"$if($isnull($mage),"Ein unentdeckter Magier",$unit($mage)) führt einen sonderbaren Tanz auf. Kurz darauf beginnt es zu regnen."</text>
+    <text locale="en">"$if($isnull($mage),"an unseen magician",$unit($mage)) dances a strange dance. Shortly after, rain begins to fall on the fields."</text>
+  </message>
   <message name="harvest_effect" section="magic">
     <type>
       <arg name="mage" type="unit"/>

res/e3a/messages.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<messages>
- <message name="raindance_effect" section="magic">
-    <type>
-      <arg name="mage" type="unit"/>
-    </type>
-    <text locale="de">"$if($isnull($mage),"Ein unentdeckter Magier",$unit($mage)) führt einen sonderbaren Tanz auf. Kurz darauf beginnt es zu regnen."</text>
-    <text locale="en">"$if($isnull($mage),"an unseen magician",$unit($mage)) dances a strange dance. Shortly after, rain begins to fall on the fields."</text>
-  </message>
-</messages>

scripts/run-turn.lua

@@ -142,8 +142,9 @@ function process(rules, orders)
         return -1
     end
 
-    callbacks(rules, 'init')
+    turn_begin()
     init_summary()
+    callbacks(rules, 'init')
 
     -- run the turn:
     if eressea.read_orders(orders) ~= 0 then
@@ -157,12 +158,13 @@ function process(rules, orders)
         return -1
     end
 
-    process_orders()
     callbacks(rules, 'update')
+    turn_process()
 
     write_files(config.locales)
     dbupdate()
 
+    turn_end()
     file = '' .. get_turn() .. '.dat'
     if eressea.write_game(file)~=0 then
         eressea.log.error("could not write game")

src/kernel/config.c

@@ -869,6 +869,7 @@ const char * game_mailcmd(void)
         }
         *r = '\0';
         log_warning("game.mailcmd configuration is not set, using %s from game.name", result);
+        config_set("game.mailcmd", result);
         return result;
     }
     return param;

src/kernel/config.test.c

@@ -278,6 +278,7 @@ static void test_game_mailcmd(CuTest *tc) {
     CuAssertStrEquals(tc, "Eressea", game_name());
     CuAssertStrEquals(tc, "ERESSEA", game_mailcmd());
     config_set("game.name", "Hodor");
+    config_set("game.mailcmd", NULL);
     CuAssertStrEquals(tc, "Hodor", game_name());
     CuAssertStrEquals(tc, "HODOR", game_mailcmd());
     config_set("game.mailcmd", "ERESSEA");

src/kernel/save.c

@@ -240,10 +240,7 @@ static faction *factionorders(void)
         }
         /* Die Partei hat sich zumindest gemeldet, so dass sie noch
          * nicht als untätig gilt */
-
-         /* TODO: +1 ist ein Workaround, weil cturn erst in process_orders
-          * incrementiert wird. */
-        f->lastorders = turn + 1;
+        f->lastorders = turn;
 
     }
     else {

src/magic.c

@@ -3010,6 +3010,7 @@ int cast_spell(struct castorder *co)
 
     fun = get_spellcast(sp->sname);
     if (!fun) {
+        log_debug("no spell function for %s, try callback", sp->sname);
         return callbacks.cast_spell(co, fname);
     }
     return fun(co);

src/summary.c

@@ -92,7 +92,7 @@ int update_nmrs(void)
             ++newplayers;
         }
         else if (!fval(f, FFL_NOIDLEOUT|FFL_CURSED)) {
-            int nmr = turn - f->lastorders + 1;
+            int nmr = turn - f->lastorders;
             if (timeout>0) {
                 if (nmr < 0 || nmr > timeout) {
                     log_error("faction %s has %d NMR", itoa36(f->no), nmr);