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

Meermenschen koennen nach der Marine-Landung nicht weiter ins Landesinnere vorstossen.

This commit is contained in:
Enno Rehling 2006-07-31 22:12:17 +00:00
parent d817d7770f
commit 3b4a6dc262
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1326,6 +1326,7 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
region * current = u->region; region * current = u->region;
region_list * iroute = route_begin; region_list * iroute = route_begin;
int steps = 0; int steps = 0;
boolean landing = false; /* aquarians have landed */
while (iroute && iroute!=route_end) { while (iroute && iroute!=route_end) {
region * next = iroute->data; region * next = iroute->data;
@ -1355,11 +1356,17 @@ travel_route(unit * u, region_list * route_begin, region_list * route_end, order
if (ord!=NULL) cmistake(u, ord, 44, MSG_MOVE); if (ord!=NULL) cmistake(u, ord, 44, MSG_MOVE);
break; break;
} }
landing = true;
} else if ((u->race->flags & RCF_WALK) == 0) { } else if ((u->race->flags & RCF_WALK) == 0) {
/* Spezialeinheiten, die nicht laufen können. */ /* Spezialeinheiten, die nicht laufen können. */
ADDMSG(&u->faction->msgs, msg_message("detectocean", ADDMSG(&u->faction->msgs, msg_message("detectocean",
"unit region", u, next)); "unit region", u, next));
break; break;
} else if (landing) {
/* wir sind diese woche angelandet */
ADDMSG(&u->faction->msgs, msg_message("detectocean",
"unit region", u, next));
break;
} }
} else { } else {
/* Ozeanfelder können nur von Einheiten mit Schwimmen und ohne /* Ozeanfelder können nur von Einheiten mit Schwimmen und ohne

9
src/res/messages.xml
View File

@ -1989,6 +1989,15 @@
<text locale="fr">"$unit($unit) discovered that $region($region) is $terrain($region)."</text> <text locale="fr">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
<text locale="en">"$unit($unit) discovered that $region($region) is $terrain($region)."</text> <text locale="en">"$unit($unit) discovered that $region($region) is $terrain($region)."</text>
</message> </message>
<message name="leftship" section="movement">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
</type>
<text locale="de">"$unit($unit) ist in dieser Runde gelandet und kann nicht weiter ins Landesinnere nach $region($region) vorstossen."</text>
<text locale="fr">"$unit($unit) has just landed and cannot continue moving to $region($region)."</text>
<text locale="en">"$unit($unit) has just landed and cannot continue moving to $region($region)."</text>
</message>
<message name="sailnolandingstorm" section="movement"> <message name="sailnolandingstorm" section="movement">
<type> <type>
<arg name="ship" type="ship"/> <arg name="ship" type="ship"/>