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

http://eressea.upb.de/mantis/view.php?id=1106

Browse source 
"Wurmloch-Betreten funktioniert nur manchmal"

Fehlermeldung, die das besser erklaert.
This commit is contained in:
Enno Rehling 2007-02-01 17:27:31 +00:00
parent feea3e0039
commit 1762317393
2 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/modules/wormhole.c
View file

@ -74,20 +74,22 @@ wormhole_age(struct attrib * a)
unit * u = r->units; unit * u = r->units;
for (;u!=NULL && maxtransport!=0;u=u->next) { for (;u!=NULL && maxtransport!=0;u=u->next) {
message * m; if (u->building==data->entry) {
if (u->number>maxtransport) continue; message * m = NULL;
if (teure_talente(u)) continue; if (u->number>maxtransport || teure_talente(u)) {
if (u->building!=data->entry) continue; m = msg_message("wormhole_requirements", "unit region", u, u->region);
} else if (data->exit!=NULL) {
if (data->exit!=NULL) {
move_unit(u, data->exit->region, NULL); move_unit(u, data->exit->region, NULL);
maxtransport -= u->number; maxtransport -= u->number;
m = msg_message("wormhole_exit", "unit region", u, data->exit->region); m = msg_message("wormhole_exit", "unit region", u, data->exit->region);
add_message(&data->exit->region->msgs, m); add_message(&data->exit->region->msgs, m);
}
if (m!=NULL) {
add_message(&u->faction->msgs, m); add_message(&u->faction->msgs, m);
msg_release(m); msg_release(m);
} }
} }
}
/* it's important that destroy_building doesn't change b->region, because /* it's important that destroy_building doesn't change b->region, because
* otherwise the tunnel would no longer be bi-directional after this */ * otherwise the tunnel would no longer be bi-directional after this */

9
src/res/messages.xml
View file

@ -6184,6 +6184,15 @@
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - No pyramids may be build in this region. The closest region to build a pyramid in is between $int($mindist) and $int($maxdist) regions away."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - No pyramids may be build in this region. The closest region to build a pyramid in is between $int($mindist) and $int($maxdist) regions away."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - No pyramids may be build in this region. The closest region to build a pyramid in is between $int($mindist) and $int($maxdist) regions away."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - No pyramids may be build in this region. The closest region to build a pyramid in is between $int($mindist) and $int($maxdist) regions away."</text>
</message> </message>
<message name="wormhole_requirements" section="events">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
</type>
<text locale="de">"$unit($unit) kann in $region($region) nicht durch das Wurmloch reisen, da die Einheit entweder zu gross ist oder teure Talente besitzt."</text>
<text locale="fr">"$unit($unit) cannot travel through the wormhole in $region($region) because the unit is either too big or has restricted skills."</text>
<text locale="en">"$unit($unit) cannot travel through the wormhole in $region($region) because the unit is either too big or has restricted skills."</text>
</message>
<message name="wormhole_exit" section="events"> <message name="wormhole_exit" section="events">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>