Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- mallorn_effect-Message

This commit is contained in:
Christian Schlittchen 2002-10-20 08:00:28 +00:00
parent 37d2e7a385
commit 29299ba260
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/study.c
View File

@ -387,12 +387,16 @@ teach(region * r, unit * u)
if (ualias(u2)) if (ualias(u2))
count++; count++;
/* this is pointless, as there currently is no way to negativly influence
* a unit by teaching it. */
/*
if (!ucontact(u2, u)) { if (!ucontact(u2, u)) {
sprintf(buf, "Einheit %s hat keinen Kontakt mit uns aufgenommen", sprintf(buf, "Einheit %s hat keinen Kontakt mit uns aufgenommen",
unitid(u2)); unitid(u2));
mistake(u, u->thisorder, buf, MSG_EVENT); mistake(u, u->thisorder, buf, MSG_EVENT);
continue; continue;
} }
*/
i = igetkeyword(u2->thisorder, u2->faction->locale); i = igetkeyword(u2->thisorder, u2->faction->locale);
/* Input ist nun von u2->thisorder !! */ /* Input ist nun von u2->thisorder !! */

2
src/common/kernel/reports.c
View File

@ -887,7 +887,7 @@ get_addresses(const faction * f, const seen_region * seenregions)
} }
#ifdef ALLIANCES #ifdef ALLIANCES
if(f->alliance != NULL) { if(f->alliance != NULL) {
faction * f2; faction *f2;
for(f2 = factions; f2; f2 = f2->next) { for(f2 = factions; f2; f2 = f2->next) {
if(f2->alliance != NULL && f2->alliance == f->alliance) { if(f2->alliance != NULL && f2->alliance == f->alliance) {
faction_list ** fnew = &flist; faction_list ** fnew = &flist;

16
src/res/de/messages.xml
View File

@ -7709,5 +7709,21 @@
<text locale="de">"$unit($unit) stürzt sich von einem amourösen Abenteuer ins nächste. ($int36($id))"</text> <text locale="de">"$unit($unit) stürzt sich von einem amourösen Abenteuer ins nächste. ($int36($id))"</text>
<text locale="en">"($int36($id))"</text> <text locale="en">"($int36($id))"</text>
</message> </message>
<message name="mallorn_effect">
<type>
<arg name="mage" type="unit"></arg>
</type>
<locale name="de">
<nr section="magic">
<text>"$unit($mage) läßt einen Teil seiner selbst in die Erde fliessen. Die Bäume, die Transformation überlebt haben, erscheinen nun viel kräftiger."</text>
</nr>
</locale>
<locale name="en">
<nr section="magic">
<text>"The power of $unit($mage) flows into the region and the trees which survived the spell appear stronger now."</text>
</nr>
</locale>
</message>
</messages> </messages>