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

Fehlermeldung beim Versuch, Zauber auf See zu sprechen.

This commit is contained in:
Enno Rehling 2002-12-14 15:04:20 +00:00
parent 5257b40b20
commit 58144e3ab5
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/report.c
View File

@ -1635,7 +1635,7 @@ order_template(FILE * F, faction * f)
} }
static void static void
report_alliances(const faction * f, const ally * sf) show_allies(const faction * f, const ally * sf)
{ {
int allierte = 0; int allierte = 0;
int i=0, h, hh = 0; int i=0, h, hh = 0;
@ -1718,7 +1718,7 @@ allies(FILE * F, faction * f)
} else { } else {
strcpy(buf, "Wir helfen den Parteien "); strcpy(buf, "Wir helfen den Parteien ");
} }
report_alliances(f, f->allies); show_allies(f, f->allies);
scat("."); scat(".");
rparagraph(F, buf, 0, 0); rparagraph(F, buf, 0, 0);
rnl(F); rnl(F);
@ -1731,7 +1731,7 @@ allies(FILE * F, faction * f)
} else { } else {
sprintf(buf, "%s hilft den Parteien ", g->name); sprintf(buf, "%s hilft den Parteien ", g->name);
} }
report_alliances(f, g->allies); show_allies(f, g->allies);
scat("."); scat(".");
rparagraph(F, buf, 0, 0); rparagraph(F, buf, 0, 0);
rnl(F); rnl(F);

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

@ -114,7 +114,7 @@ dbrace(const struct race * rc)
char * zPtr = zText; char * zPtr = zText;
strcpy(zText, LOC(find_locale("en"), rc_name(rc, 0))); strcpy(zText, LOC(find_locale("en"), rc_name(rc, 0)));
while (*zPtr) { while (*zPtr) {
*zPtr = toupper(*zPtr); *zPtr = (char)(toupper(*zPtr));
++zPtr; ++zPtr;
} }
return zText; return zText;

4
src/common/kernel/magic.c
View File

@ -1581,7 +1581,7 @@ regeneration_magiepunkte(void)
reg_aura = min((auramax - aura), reg_aura); reg_aura = min((auramax - aura), reg_aura);
aura += (int)reg_aura; aura += (int)reg_aura;
add_message(&u->faction->msgs, msg_message( ADDMSG(&u->faction->msgs, msg_message(
"regenaura", "unit region amount", "regenaura", "unit region amount",
u, r, (int)reg_aura)); u, r, (int)reg_aura));
} }
@ -3013,6 +3013,8 @@ magic(void)
&& !fval(u->race, RCF_SWIM) && !fval(u->race, RCF_SWIM)
&& !(sp->sptyp & OCEANCASTABLE)) { && !(sp->sptyp & OCEANCASTABLE)) {
/* Fehlermeldung */ /* Fehlermeldung */
ADDMSG(&u->faction->msgs, msg_message("spellfail_onocean",
"unit region command", u, u->region, so->s));
continue; continue;
} }
/* Auf bewegenden Schiffen kann man nur explizit als /* Auf bewegenden Schiffen kann man nur explizit als

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

@ -3000,6 +3000,16 @@
</locale> </locale>
</message> </message>
<message name="spellfail_onocean" section="errors">
<type>
<arg name="unit" type="unit"></arg>
<arg name="region" type="region"></arg>
<arg name="command" type="string"></arg>
</type>
<text locale="de">"$unit($unit) in $region($region): '$command' - Dieser Zauber kann nicht auf hoher See gezaubert werden."</text>
<text locale="en">"$unit($unit) in $region($region): '$command' - This spell cannot be cast while you are on the ocean."</text>
</message>
<message name="error206"> <message name="error206">
<type> <type>
<arg name="unit" type="unit"></arg> <arg name="unit" type="unit"></arg>