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

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

"hungernde Einheit auf See kann keine Personen abgeben"

An die Fluten ist es jetzt erlaubt.
This commit is contained in:
Enno Rehling 2007-02-01 21:13:24 +00:00
parent 3cda0e6f0e
commit 5265afda8d
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/kernel/give.c
View File

@ -164,8 +164,10 @@ give_men(int n, unit * u, unit * u2, struct order * ord)
#endif #endif
} else if ((u && unit_has_cursed_item(u)) || (u2 && unit_has_cursed_item(u2))) { } else if ((u && unit_has_cursed_item(u)) || (u2 && unit_has_cursed_item(u2))) {
error = 78; error = 78;
} else if (fval(u, UFL_LOCKED) || fval(u, UFL_HUNGER) || is_cursed(u->attribs, C_SLAVE, 0)) { } else if (fval(u, UFL_LOCKED) || is_cursed(u->attribs, C_SLAVE, 0)) {
error = 74; error = 74;
} else if (u2 && fval(u, UFL_HUNGER)) {
error = 320;
} else if (u2 && (fval(u2, UFL_LOCKED)|| is_cursed(u2->attribs, C_SLAVE, 0))) { } else if (u2 && (fval(u2, UFL_LOCKED)|| is_cursed(u2->attribs, C_SLAVE, 0))) {
error = 75; error = 75;
} else if (u2 && u2->faction != u->faction && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) { } else if (u2 && u2->faction != u->faction && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) {

16
src/res/messages.xml
View File

@ -5173,15 +5173,25 @@
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
</message> </message>
<message name="error74" section="errors"> <message name="error742" section="errors">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>
<arg name="command" type="order"/> <arg name="command" type="order"/>
</type> </type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Eine hungernde Einheit kann niemanden weggeben."</text> <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Eine hungernde Einheit kann niemanden weggeben."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give away anybody."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - Hungry units cannot give anybody away."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give away anybody."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - Hungry units cannot give anybody away."</text>
</message>
<message name="error74" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Diese Einheit kann niemanden weggeben."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit cannot give anybody away."</text>
</message> </message>
<message name="error73" section="errors"> <message name="error73" section="errors">
<type> <type>