From 375125ae90398d8be67f7fd55cb00ade41a242e0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 10 Feb 2007 22:04:13 +0000 Subject: [PATCH] stormwinds effect is a very common message, should be translated. --- src/common/spells/spells.c | 36 ++++++++++++++++++------------------ src/res/messages.xml | 8 ++++++++ 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c index d361677f1..abcfc1d39 100644 --- a/src/common/spells/spells.c +++ b/src/common/spells/spells.c @@ -2263,7 +2263,7 @@ sp_stormwinds(castorder *co) double power = co->force; spellparameter *pa = co->par; int n, force = (int)power; - + message * m = NULL; /* melden vorbereiten */ for(f = factions; f; f = f->next ) freset(f, FL_DH); @@ -2298,26 +2298,26 @@ sp_stormwinds(castorder *co) /* melden vorbereiten: */ for(u = r->units; u; u = u->next ) { - if(u->ship != sh ) /* nur den Schiffsbesatzungen! */ - continue; - - fset(u->faction, FL_DH); - } - - } - /* melden, 1x pro Partei auf Schiff und für den Magier */ - fset(mage->faction, FL_DH); - for(u = r->units; u; u = u->next ) { - if(fval(u->faction, FL_DH)) { - freset(u->faction, FL_DH); - if (erfolg > 0){ - sprintf(buf, "%s beschwört einen magischen Wind, der die Schiffe " - "über das Wasser treibt.", - cansee(u->faction, r, mage, 0) ? unitname(mage) : "Jemand"); - addmessage(r, u->faction, buf, MSG_EVENT, ML_INFO); + if (u->ship == sh ) { + /* nur den Schiffsbesatzungen! */ + fset(u->faction, FL_DH); } } } + /* melden, 1x pro Partei auf Schiff und für den Magier */ + fset(mage->faction, FL_DH); + for (u = r->units; u; u = u->next ) { + if (fval(u->faction, FL_DH)) { + freset(u->faction, FL_DH); + if (erfolg > 0) { + if (!m) { + m = msg_message("stormwinds_effect", "unit", mage); + } + r_addmessage(r, u->faction, m); + } + } + } + if (m) msg_release(m); return erfolg; } diff --git a/src/res/messages.xml b/src/res/messages.xml index 1dbea1848..498992be0 100644 --- a/src/res/messages.xml +++ b/src/res/messages.xml @@ -5317,6 +5317,14 @@ "$unit($unit) in $region($region): '$order($command)' - The unit could not be found." "$unit($unit) in $region($region): '$order($command)' - The unit could not be found." + + + + + "$unit($unit) beschwört einen magischen Wind, der die Schiffe über das Wasser treibt." + "$unit($unit) calls up a magical storm that whips the ship over the waters." + "$unit($unit) calls up a magical storm that whips the ship over the waters." +