From 46cb4748858b0f482074213605ec48566450eadd Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 9 Oct 2005 02:10:03 +0000
Subject: [PATCH] Zaubernamen weniger deutsch & Patzerfunktion vereinheitlicht

---
 src/common/kernel/spell.c | 32 ++++++++++----------------------
 src/res/de/strings.xml    |  4 ++--
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index 8d39e74ad..e9a36c959 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -113,13 +113,13 @@ spellcmd(const strarray * sa, const struct locale * lang) {
 	return buf;
 }
 
-void
+static void
 report_failure(unit * mage, const strarray * sa) {
 	/* Fehler: "Der Zauber schlägt fehl" */
 	cmistake(mage, strdup(spellcmd(sa, mage->faction->locale)), 180, MSG_MAGIC);
 }
 #else
-void
+static void
 report_failure(unit * mage, struct order * ord) {
 	/* Fehler: "Der Zauber schlägt fehl" */
 	cmistake(mage, ord, 180, MSG_MAGIC);
@@ -7347,18 +7347,6 @@ sp_createitem_regeneration(castorder *co)
 	return cast_level;
 }
 
-/* ------------------------------------------------------------- */
-/* Dummy-Zauberpatzer, Platzhalter für speziel auf die Sprüche
- * zugeschnittene Patzer */
-void
-patzer_createitem(castorder *co)
-{
-	unit *mage = (unit *)co->magician;
-
-	report_failure(mage, co->order);
-	return;
-}
-
 /* ------------------------------------------------------------- */
 /* Erläuterungen zu den Spruchdefinitionen
  *
@@ -7727,7 +7715,7 @@ static spell spelldaten[] =
     (spell_f)sp_rosthauch, patzer
   },
   {
-    SPL_KAELTESCHUTZ, "kaelteschutz", NULL, NULL,
+    SPL_KAELTESCHUTZ, "cold_protection", NULL, NULL,
     "u+",
     M_DRUIDE,
     (UNITSPELL | SPELLLEVEL | TESTCANSEE | ONSHIPCAST),
@@ -7742,7 +7730,7 @@ static spell spelldaten[] =
     (spell_f)sp_kaelteschutz, patzer
   },
   {
-    SPL_HAGEL, "hagel", NULL, NULL, NULL,
+    SPL_HAGEL, "hail", NULL, NULL, NULL,
     M_DRUIDE, (COMBATSPELL|SPELLLEVEL), 5, 3,
     {
       { R_AURA, 1, SPC_LEVEL },
@@ -8788,7 +8776,7 @@ static spell spelldaten[] =
       { 0, 0, 0 },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_invisibility2, patzer_createitem
+    (spell_f)sp_createitem_invisibility2, patzer
   },
   {
     SPL_SUMMON_ALP, "summon_alp", NULL, NULL, "u",
@@ -9752,7 +9740,7 @@ static spell spelldaten[] =
       { 0, 0, 0 },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_power, patzer_createitem
+    (spell_f)sp_createitem_power, patzer
   },
   {
     SPL_VIEWREALITY, "view_reality",
@@ -9909,7 +9897,7 @@ static spell spelldaten[] =
       { 0, 0, 0 },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_aura, patzer_createitem
+    (spell_f)sp_createitem_aura, patzer
   },
   {
     SPL_ARTEFAKT_OF_REGENERATION, "regeneration",
@@ -9924,7 +9912,7 @@ static spell spelldaten[] =
       { 0, 0, 0 },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_regeneration, patzer_createitem
+    (spell_f)sp_createitem_regeneration, patzer
   },
   {
     SPL_ARTEFAKT_CHASTITYBELT, "create_chastitybelt",
@@ -9939,7 +9927,7 @@ static spell spelldaten[] =
       { 0, 0, 0 },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_chastitybelt, patzer_createitem
+    (spell_f)sp_createitem_chastitybelt, patzer
   },
   {
     SPL_METEORRAIN, "meteor_rain",
@@ -9971,7 +9959,7 @@ static spell spelldaten[] =
       { R_EOGSWORD, 1, SPC_FIX },
       { 0, 0, 0 }
     },
-    (spell_f)sp_createitem_runesword, patzer_createitem
+    (spell_f)sp_createitem_runesword, patzer
   },
   {
     SPL_BECOMEWYRM, "wyrm_transformation",
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index 03b6d57cd..ea31b4dc2 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -4140,11 +4140,11 @@
       <text locale="de">Rostregen</text>
       <text locale="en">Rain Of Rust</text>
     </string>
-    <string name="kaelteschutz">
+    <string name="cold_protection">
       <text locale="de">Firuns Fell</text>
       <text locale="en">Firun's Coat</text>
     </string>
-    <string name="hagel">
+    <string name="hail">
       <text locale="de">Hagel</text>
       <text locale="en">Hail</text>
     </string>