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

translated two more ship movement messages to english.

This commit is contained in:
Enno Rehling 2005-07-31 09:12:36 +00:00
parent 7b0340b69c
commit 8bee14a0ea
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1219,7 +1219,6 @@ count_all(const faction * f)
int
count_migrants (const faction * f)
{
#ifndef NDEBUG
unit *u = f->units;
int n = 0;
while (u) {
@ -1231,7 +1230,6 @@ count_migrants (const faction * f)
}
u = u->nextF;
}
#endif
return n;
}

30
src/common/kernel/movement.c
View File

@ -1580,18 +1580,8 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
if (tnext != T_OCEAN) {
if (!move_on_land) {
/* check that you're not traveling from one land region to another. */
plane *pl = getplane(next_point);
if (pl!=NULL && fval(pl, PFL_NOCOORDS)) {
/* we don't have that case yet, but hey... */
sprintf(buf, "Die %s entdeckt, daß im %s Festland ist.",
shipname(sh), locale_string(u->faction->locale, directions[dir]));
} else {
sprintf(buf, "Die %s entdeckt, daß (%d,%d) Festland ist.",
shipname(sh), region_x(next_point,u->faction),
region_y(next_point,u->faction));
}
addmessage(0, u->faction, buf, MSG_MOVE, ML_WARN);
ADDMSG(&u->faction->msgs, msg_message("shipnoshore",
"ship region", sh, next_point));
break;
}
} else {
@ -1687,17 +1677,11 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
set_order(&u->thisorder, NULL);
set_coast(sh, last_point, current_point);
sprintf(buf, "Die %s ", shipname(sh));
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) )
scat("fliegt");
else
scat("segelt");
scat(" von ");
scat(regionname(starting_point, u->faction));
scat(" nach ");
scat(regionname(current_point, u->faction));
scat(".");
addmessage(0, u->faction, buf, MSG_MOVE, ML_INFO);
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
ADDMSG(&f->msgs, msg_message("shipfly", "ship from to", sh, starting_point, current_point));
} else {
ADDMSG(&f->msgs, msg_message("shipsail", "ship from to", sh, starting_point, current_point));
}
/* Das Schiff und alle Einheiten darin werden nun von
* starting_point nach current_point verschoben */

2
src/common/util/resolve.h
View File

@ -15,7 +15,7 @@
#ifndef RESOLVE_H
#define RESOLVE_H
#include <util/variant.h>
#include "variant.h"
#ifdef __cplusplus
extern "C" {

26
src/res/messages.xml
View File

@ -2632,6 +2632,32 @@
<text locale="fr">"The $ship($ship) suffers too heavy damage and sinks."</text>
<text locale="en">"The $ship($ship) suffers too heavy damage and sinks."</text>
</message>
<message name="shipnoshore" section="movement">
<type>
<arg name="ship" type="ship"/>
<arg name="region" type="region"/>
</type>
<text locale="de">"Die $ship($ship) entdeckt, dass $region($region) Festland ist."</text>
<text locale="en">"The $ship($ship) discovers that $region($region) has no shore."</text>
</message>
<message name="shipfly" section="movement">
<type>
<arg name="ship" type="ship"/>
<arg name="from" type="region"/>
<arg name="to" type="region"/>
</type>
<text locale="de">"Die $ship($ship) fliegt von $region($from) nach $region($to)."</text>
<text locale="en">"The $ship($ship) flies from $region($from) to $region($to)."</text>
</message>
<message name="shipsail" section="movement">
<type>
<arg name="ship" type="ship"/>
<arg name="from" type="region"/>
<arg name="to" type="region"/>
</type>
<text locale="de">"Die $ship($ship) segelt von $region($from) nach $region($to)."</text>
<text locale="en">"The $ship($ship) sails from $region($from) to $region($to)."</text>
</message>
<message name="shipnoconf" section="events">
<type>
<arg name="ship" type="ship"/>