Merge branch 'feature/rename-cerddor' into develop

res/core/de/strings.xml

@@ -3922,7 +3922,7 @@
       <text locale="de">Gesang des Lebens analysieren</text>
       <text locale="en">Analyze Song of Life</text>
     </string>
-    <string name="cerrdorfumbleshield">
+    <string name="cerddorfumbleshield">
       <text locale="de">Bannlied</text>
       <text locale="en">Countersong</text>
     </string>
@@ -4324,7 +4324,7 @@
       <text locale="de">Kraft der Natur</text>
       <text locale="en">force of nature</text>
     </string>
-    <string name="wdwpyramid_cerrdor">
+    <string name="wdwpyramid_cerddor">
       <text locale="de">Gesang der Götter</text>
       <text locale="en">Song of the Gods</text>
     </string>
@@ -5126,7 +5126,7 @@
       able to decipher all enchantments or spells, which
       aren't disguised beyond your capability.</text>
     </string>
-    <string name="cerrdorfumbleshield">
+    <string name="cerddorfumbleshield">
       <text locale="de">Dieser schrille Gesang hallt über das
       ganze Schlachtfeld. Die besonderen Dissonanzen in den
       Melodien machen es Magiern fast unmöglich, sich auf ihre

res/e3a/spellbooks/common.xml

@@ -37,7 +37,7 @@
     <entry spell="summon_familiar" level="9" />
     <entry spell="draigfumbleshield" level="9" />
     <entry spell="gwyrrdfumbleshield" level="5" />
-    <entry spell="cerrdorfumbleshield" level="5" />
+    <entry spell="cerddorfumbleshield" level="5" />
     <entry spell="tybiedfumbleshield" level="2" />
     <entry spell="concealing_aura" level="1" />
     <entry spell="shockwave" level="5" />

res/e3a/spellbooks/gray.xml

@@ -22,7 +22,7 @@
     <entry spell="calm_monster" level="6" />
     <entry spell="calm_riot" level="14" />
     <entry spell="cerddor_destroymagic" level="8" />
-    <entry spell="cerrdorfumbleshield" level="5" />
+    <entry spell="cerddorfumbleshield" level="5" />
     <entry spell="chaosrow" level="8" />
     <entry spell="clone" level="9" />
     <entry spell="coldfront" level="8" />

res/e3a/spells.xml

@@ -619,7 +619,7 @@
   <spell name="gwyrrdfumbleshield" rank="2" index="144" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="cerrdorfumbleshield" rank="2" index="145" variable="true" combat="1">
+  <spell name="cerddorfumbleshield" rank="2" index="145" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
   <spell name="tybiedfumbleshield" rank="2" index="146" variable="true" combat="1">

res/eressea/spellbooks/cerddor.xml

@@ -27,7 +27,7 @@
   <entry spell="summon_familiar" level="9" />
   <entry spell="song_of_slavery" level="13" />
   <entry spell="cerddor_destroymagic" level="8" />
-  <entry spell="cerrdorfumbleshield" level="5" />
+  <entry spell="cerddorfumbleshield" level="5" />
   <entry spell="big_recruit" level="14" />
   <entry spell="raindance" level="3" />
   <entry spell="create_roi" level="6" />

res/eressea/spellbooks/gray.xml

@@ -26,7 +26,7 @@
   <entry spell="calm_monster" level="6" />
   <entry spell="calm_riot" level="15" />
   <entry spell="cerddor_destroymagic" level="8" />
-  <entry spell="cerrdorfumbleshield" level="5" />
+  <entry spell="cerddorfumbleshield" level="5" />
   <entry spell="chaosrow" level="8" />
   <entry spell="chaossuction" level="14" />
   <entry spell="clone" level="9" />

res/eressea/spells.xml

@@ -402,7 +402,7 @@
   <spell name="gwyrrdfumbleshield" rank="2" index="144" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
-  <spell name="cerrdorfumbleshield" rank="2" index="145" variable="true" combat="1">
+  <spell name="cerddorfumbleshield" rank="2" index="145" variable="true" combat="1">
     <resource name="aura" amount="5" cost="level"/>
   </spell>
   <spell name="tybiedfumbleshield" rank="2" index="146" variable="true" combat="1">

src/kernel/messages.c

@@ -205,12 +205,6 @@ caddmessage(region * r, faction * f, const char *s, msg_t mtype, int level)
 {
     message *m = NULL;
 
-#define LOG_ENGLISH
-#ifdef LOG_ENGLISH
-    if (f && f->locale != default_locale) {
-        log_warning("message for locale \"%s\": %s\n", locale_name(f->locale), s);
-    }
-#endif
     unused_arg(level);
     switch (mtype) {
     case MSG_INCOME:

src/kernel/pool.c

@@ -78,9 +78,6 @@ int change_resource(unit * u, const resource_type * rtype, int change)
         assert(!"undefined resource detected. rtype->uchange not initialized.");
     assert(i == get_resource(u, rtype));
     assert(i >= 0);
-    if (i >= 100000000) {
-        log_warning("%s has %d %s\n", unitname(u), i, rtype->_name);
-    }
     return i;
 }
 

src/kernel/spell.c

@@ -78,6 +78,7 @@ static const char *sp_aliases[][2] = {
     { "illaunfamiliar", "summon_familiar" },
     { "draigfamiliar", "summon_familiar" },
     { "commonfamiliar", "summon_familiar" },
+    { "cerrdorfumbleshield", "cerddorfumbleshield" },
     { NULL, NULL },
 };
 

src/kernel/spellid.h

@@ -136,7 +136,7 @@ enum {
   SPL_GWYRRD_ARMORSHIELD,
   SPL_DRAIG_FUMBLESHIELD,
   SPL_GWYRRD_FUMBLESHIELD,
-  SPL_CERRDOR_FUMBLESHIELD,
+  SPL_CERDDOR_FUMBLESHIELD,
   SPL_TYBIED_FUMBLESHIELD,
   SPL_SHADOWKNIGHTS = 147,
   SPL_ITEMCLOAK = 150,

src/spells.c

@@ -6583,7 +6583,7 @@ static spelldata spell_functions[] = {
     { "heroic_song", sp_hero, 0 },
     { "transfer_aura_song", sp_transferaura, 0 },
     { "analysesong_unit", sp_analysesong_unit, 0 },
-    { "cerrdorfumbleshield", sp_fumbleshield, 0 },
+    { "cerddorfumbleshield", sp_fumbleshield, 0 },
     { "calm_monster", sp_calm_monster, 0 },
     { "seduction", sp_seduce, 0 },
     { "headache", sp_headache, 0 },

src/spells/combatspells.c

@@ -1504,7 +1504,7 @@ int sp_fumbleshield(struct castorder * co)
     switch (sp->id) {
     case SPL_DRAIG_FUMBLESHIELD:
     case SPL_GWYRRD_FUMBLESHIELD:
-    case SPL_CERRDOR_FUMBLESHIELD:
+    case SPL_CERDDOR_FUMBLESHIELD:
     case SPL_TYBIED_FUMBLESHIELD:
         duration = 100;
         effect = _max(1, 25 - level);