Merge branch 'develop'

conf/e2/config.json

@@ -28,6 +28,7 @@
     ],
     "settings": {
         "game.name" : "Eressea",
+        "game.mailcmd" : "ERESSEA",
         "game.id" : 2,
         "orders.default": "work",
         "NewbieImmunity": 8,

conf/e3/config.json

@@ -43,6 +43,7 @@
     ],
     "settings": {
         "game.name" : "Eressea",
+        "game.mailcmd" : "ERESSEA",
         "game.id" : 3,
         "orders.default": "work",
         "database.gameid": 7,

res/e3a/spells.xml

@@ -68,7 +68,6 @@
   </spell>
   <spell name="readmind" parameters="u" rank="5">
     <!-- Traumdeuten -->
-    <function name="cast" value="cast_readmind"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
@@ -113,7 +112,6 @@
   </spell>
   <spell name="fireball" rank="5" variable="true" combat="2">
     <!-- Feuerball -->
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="magicboost" rank="3" ship="true">
@@ -213,7 +211,6 @@
   </spell>
   <spell name="blabbermouth" parameters="u" los="true" rank="5">
     <!-- Plappermaul -->
-    <function name="cast" value="cast_babbler"/>
     <resource name="aura" amount="10" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
@@ -290,7 +287,6 @@
   <!-- new gwyrrd -->
   <spell name="blessedharvest" rank="5" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
-    <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="earn_silver#gwyrrd" ship="true" variable="true" rank="5">
@@ -311,7 +307,6 @@
   </spell>
   <spell name="hail" rank="5" variable="true" combat="2">
     <!-- Hagel -->
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="goodwinds" rank="5" parameters="s" ship="true" variable="true">
@@ -489,7 +484,6 @@
   </spell>
   <spell name="raindance" rank="5" ship="true" far="true" variable="true">
     <!-- Regentanz -->
-    <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="irongolem" rank="4" variable="true">
@@ -580,7 +574,6 @@
     <resource name="laen" amount="5" cost="fixed"/>
   </spell>
   <spell name="summon_familiar" rank="5">
-    <function name="cast" value="cast_familiar"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
@@ -619,7 +612,6 @@
     <resource name="aura" amount="3" cost="fixed"/>
   </spell>
   <spell name="meteor_rain" rank="5" variable="true" combat="2">
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="wyrm_transformation" rank="5">

res/eressea/spells.xml

@@ -16,11 +16,9 @@
   </spell>
 
   <spell name="fireball" rank="5" variable="true" combat="2">
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="hail" rank="5" variable="true" combat="2">
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="rustweapon" rank="5" parameters="u+" los="true" far="true" variable="true">
@@ -290,7 +288,6 @@
     <resource name="aura" amount="2" cost="level"/>
   </spell>
   <spell name="igjarjuk" rank="5" variable="true" combat="1">
-    <function name="cast" value="igjarjuk"/>
   </spell>
   <spell name="resist_magic" rank="2" parameters="u+" los="true" ship="true" variable="true">
     <resource name="aura" amount="5" cost="level"/>
@@ -326,7 +323,6 @@
     <resource name="aura" amount="3" cost="level"/>
   </spell>
   <spell name="meteor_rain" rank="5" variable="true" combat="2">
-    <function name="cast" value="combat_spell"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
   <spell name="fish_shield" rank="2" variable="true" combat="1">
@@ -356,7 +352,6 @@
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
   <spell name="summon_familiar" rank="5">
-    <function name="cast" value="cast_familiar"/>
     <resource name="aura" amount="100" cost="fixed"/>
     <resource name="permaura" amount="5" cost="fixed"/>
   </spell>
@@ -504,7 +499,6 @@
   <!-- gwyrrd spells -->
   <spell name="blessedharvest" rank="5" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
-    <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
@@ -537,7 +531,6 @@
   <!-- cerddor spells -->
   <spell name="raindance" rank="5" ship="true" far="true" variable="true">
     <!-- Segen der Erde -->
-    <function name="cast" value="cast_blessedharvest"/>
     <resource name="aura" amount="1" cost="level"/>
   </spell>
 
@@ -552,13 +545,11 @@
   </spell>
 
   <spell name="blabbermouth" parameters="u" los="true" rank="5">
-    <function name="cast" value="cast_babbler"/>
     <resource name="aura" amount="10" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>
 
   <spell name="readmind" parameters="u" rank="5">
-    <function name="cast" value="cast_readmind"/>
     <resource name="aura" amount="20" cost="fixed"/>
     <!-- missing syntactical info: ONETARGET | UNITSPELL -->
   </spell>

src/kernel/faction.c

@@ -237,7 +237,7 @@ faction *addfaction(const char *email, const char *password,
     if (check_email(email) == 0) {
         faction_setemail(f, email);
     } else {
-        log_warning("Invalid email address for faction %s: %s\n", itoa36(f->no), email?email:"");
+        log_info("Invalid email address for faction %s: %s\n", itoa36(f->no), email?email:"");
         faction_setemail(f, NULL);
     }