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

Improve sailing messages to include the region.

Browse source 
http://bugs.eressea.de/view.php?id=1729
This commit is contained in:
Enno Rehling 2011-05-02 23:34:35 -07:00
parent a2816f1528
commit 58208e0db5
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
res/messages.xml
View file

@ -2949,10 +2949,11 @@
<message name="sailnolandingstorm" section="movement"> <message name="sailnolandingstorm" section="movement">
<type> <type>
<arg name="ship" type="ship"/> <arg name="ship" type="ship"/>
<arg name="region" type="region"/>
</type> </type>
<text locale="de">"Die Mannschaft der $ship($ship) kann in letzter Sekunde verhindern, dass das Schiff auf Land aufläuft."</text> <text locale="de">"Die Mannschaft der $ship($ship) kann in letzter Sekunde verhindern, dass das Schiff in $region($region) auf Land aufläuft."</text>
<text locale="fr">"In the very last moment, the crew of the $ship($ship) saved the ship from grounding."</text> <text locale="fr">"In the very last moment, the crew of the $ship($ship) saved the ship from grounding in $region($region)."</text>
<text locale="en">"In the very last moment, the crew of the $ship($ship) saved the ship from grounding."</text> <text locale="en">"In the very last moment, the crew of the $ship($ship) saved the ship from grounding in $region($region)."</text>
</message> </message>
<message name="sailnolanding" section="movement"> <message name="sailnolanding" section="movement">
<type> <type>

2
src/kernel/move.c
View file

@ -1820,7 +1820,7 @@ sail(unit * u, order * ord, boolean move_on_land, region_list ** routep)
if (reason<0) { if (reason<0) {
/* for some reason or another, we aren't allowed in there.. */ /* for some reason or another, we aren't allowed in there.. */
if (check_leuchtturm(current_point, NULL) || reason == SA_NO_INSECT) { if (check_leuchtturm(current_point, NULL) || reason == SA_NO_INSECT) {
ADDMSG(&f->msgs, msg_message("sailnolandingstorm", "ship", sh)); ADDMSG(&f->msgs, msg_message("sailnolandingstorm", "ship region", sh, next_point));
} else { } else {
float dmg = float dmg =
get_param_flt(global.parameters, "rules.ship.damage.nolanding", get_param_flt(global.parameters, "rules.ship.damage.nolanding",