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

Merge pull request #443 from ennorehling/develop 

fix terrain in detectocean message
This commit is contained in:
Enno Rehling 2015-12-17 20:50:24 +01:00
parent a05ecb588d acab4b3199
commit 35e2e438e1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/core/messages.xml
View File

@ -2899,9 +2899,10 @@
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="terrain" type="string"/>
</type>
<text locale="de">"$unit($unit) entdeckt, dass $region($region) $terrain($region) ist."</text>
<text locale="en">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
<text locale="de">"$unit($unit) entdeckt, dass $region($region) $localize($terrain) ist."</text>
<text locale="en">"$unit($unit) discovered that $region($region) is $localize($terrain)."</text>
</message>
<message name="leftship" section="movement">
<type>

6
src/move.c
View File

@ -1592,13 +1592,13 @@ static const region_list *travel_route(unit * u,
else if ((u_race(u)->flags & RCF_WALK) == 0) {
/* Spezialeinheiten, die nicht laufen können. */
ADDMSG(&u->faction->msgs, msg_message("detectocean",
"unit region", u, next));
"unit region terrain", u, next, terrain_name(next)));
break;
}
else if (landing) {
/* wir sind diese woche angelandet */
ADDMSG(&u->faction->msgs, msg_message("detectocean",
"unit region", u, next));
"unit region terrain", u, next, terrain_name(next)));
break;
}
}
@ -1607,7 +1607,7 @@ static const region_list *travel_route(unit * u,
* Pferde betreten werden. */
if (!(canswim(u) || canfly(u))) {
ADDMSG(&u->faction->msgs, msg_message("detectocean",
"unit region", u, next));
"unit region terrain", u, next, terrain_name(next)));
break;
}
}